Skip to content
Snippets Groups Projects
Commit b0d7619f authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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

parent 316f1fd0
No related branches found
No related tags found
No related merge requests found
...@@ -148,28 +148,13 @@ bool LLAppViewerMacOSX::initParseCommandLine(LLCommandLineParser& clp) ...@@ -148,28 +148,13 @@ bool LLAppViewerMacOSX::initParseCommandLine(LLCommandLineParser& clp)
// The next two lines add the support for parsing the mac -psn_XXX arg. // The next two lines add the support for parsing the mac -psn_XXX arg.
clp.addOptionDesc("psn", NULL, 1, "MacOSX process serial number"); clp.addOptionDesc("psn", NULL, 1, "MacOSX process serial number");
clp.setCustomParser(parse_psn); 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 // parse the user's command line
// Succesive calls to clp.parse... will NOT override earlier options.
if(clp.parseCommandLine(gArgC, gArgV) == false) if(clp.parseCommandLine(gArgC, gArgV) == false)
{ {
return false; return false;
} }
// Get the user's preferred language string based on the Mac OS localization mechanism. // Get the user's preferred language string based on the Mac OS localization mechanism.
// To add a new localization: // To add a new localization:
// go to the "Resources" section of the project // go to the "Resources" section of the project
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment