FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added DisplaySettings::s/getApplication() to help with gecko plugin initialization when it requires the application name

Browse Source
This commit is contained in:
Robert Osfield
2008-11-20 12:03:21 +00:00
parent d4c1634571
commit 98df67c918
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osg/DisplaySettings.cpp
View File

@@ -77,6 +77,8 @@ void DisplaySettings::setDisplaySettings(const DisplaySettings& vs)
_numDatabaseThreadsHint = vs._numDatabaseThreadsHint;
_numHttpDatabaseThreadsHint = vs._numHttpDatabaseThreadsHint;
_application = vs._application;
}
void DisplaySettings::merge(const DisplaySettings& vs)
@@ -98,6 +100,8 @@ void DisplaySettings::merge(const DisplaySettings& vs)
if (vs._numDatabaseThreadsHint>_numDatabaseThreadsHint) _numDatabaseThreadsHint = vs._numDatabaseThreadsHint;
if (vs._numHttpDatabaseThreadsHint>_numHttpDatabaseThreadsHint) _numHttpDatabaseThreadsHint = vs._numHttpDatabaseThreadsHint;
if (_application.empty()) _application = vs._application;
}
void DisplaySettings::setDefaults()
@@ -375,6 +379,7 @@ void DisplaySettings::readEnvironmentalVariables()
void DisplaySettings::readCommandLine(ArgumentParser& arguments)
{
if (_application.empty()) _application = arguments[0];
// report the usage options.
if (arguments.getApplicationUsage())