livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHOP-957: Stop looking for, or parsing, Mac arguments.txt file.

master
Nat Goodspeed 2013-06-25 17:33:36 -04:00
parent 316f1fd026
commit b0d7619f20
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llappviewermacosx.cpp
View File

@ -148,28 +148,13 @@ bool LLAppViewerMacOSX::initParseCommandLine(LLCommandLineParser& clp)
// The next two lines add the support for parsing the mac -psn_XXX arg.
clp.addOptionDesc("psn", NULL, 1, "MacOSX process serial number");
clp.setCustomParser(parse_psn);
// First read in the args from arguments txt.
const char* filename = "arguments.txt";
llifstream ifs(filename, llifstream::binary);
if (!ifs.is_open())
{
llwarns << "Unable to open file" << filename << llendl;
return false;
}
if(clp.parseCommandLineFile(ifs) == false)
{
return false;
}
// Then parse the user's command line, so that any --url arg can appear last
// Succesive calls to clp.parse... will NOT override earlier options.
// parse the user's command line
if(clp.parseCommandLine(gArgC, gArgV) == false)
{
return false;
}
// Get the user's preferred language string based on the Mac OS localization mechanism.
// To add a new localization:
// go to the "Resources" section of the project