Commit f33fb4b7 authored by hrchilds's avatar hrchilds

Merge RC to trunk, picking up with -display being passed.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16752 18c085ea-50e0-402c-830e-de6fd14e8384
parent b89267de
......@@ -411,6 +411,10 @@ RemoteProxyBase::AddArgument(const std::string &arg)
// Tom Fogal, Fri May 6 18:34:52 MDT 2011
// Adjust for new X launch options.
//
// Hank Childs, Fri Nov 18 07:23:04 PST 2011
// Make sure -display gets added whenever we do HW acceleration (not just
// when we launch x-servers).
//
// ****************************************************************************
void
......@@ -578,11 +582,11 @@ RemoteProxyBase::AddProfileArguments(const MachineProfile &machine,
AddArgument("-x-args");
AddArgument(launch->GetXArguments());
}
if(!launch->GetXDisplay().empty())
{
AddArgument("-display");
AddArgument(launch->GetXDisplay());
}
}
if(!launch->GetXDisplay().empty())
{
AddArgument("-display");
AddArgument(launch->GetXDisplay());
}
AddArgument("-n-gpus-per-node");
{
......
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta http-equiv="Content-Language" content="en-us">
<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
<meta name="ProgId" content="FrontPage.Editor.Document">
<title>VisIt 2.4.1 Release Notes</title>
</head>
<body>
<center><b><font size="6">VisIt 2.4.1 Release Notes</font></b></center>
<p>Welcome to VisIt's release notes page. Release 2.4.1 is primarily a
bug fix release to release 2.4. It fixes additional bugs in release
2.4. Look <a href="relnotes2.4.0.html">here</a> to see a complete
list of changes in release 2.4.</p>
<p><b><font size="4">Bugs fixed in version 2.4.1</font></b></p>
<ul>
<li>VisIt now correctly passes along the -display flag when using hardware acceleration on its parallel server.</li>
</ul>
<p><b><font size="4">Enhancements in version 2.4.1</font></b></p>
<ul>
<li> </li>
</ul>
<p>Click the following link to view the release notes for the previous
version of VisIt: <a href="relnotes2.4.0.html">VisIt 2.4 Release Notes</a>.</p>
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment