1 files changed, 10 insertions, 20 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index c36dd2955e..1993fd0a76 100644
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -31,11 +31,9 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llmemtype.h"
 #include "llappviewerlinux.h"
 
-#include "llcommandlineparser.h"
-
-#include "llmemtype.h"
 #include "llviewernetwork.h"
 #include "llmd5.h"
 
@@ -56,12 +54,6 @@
   #     include <ucontext.h>
   #endif
 
-namespace
-{
-	int gArgC = 0;
-	char **gArgV = NULL;
-}
-
 int main( int argc, char **argv ) 
 {
 	LLMemType mt1(LLMemType::MTYPE_STARTUP);
@@ -70,14 +62,18 @@ int main( int argc, char **argv )
 	asm ("ta\t6");		 // NOTE:  Make sure memory alignment is enforced on SPARC
 #endif
 
-	gArgC = argc;
-	gArgV = argv;
-
 	LLAppViewer* viewer_app_ptr = new LLAppViewerLinux();
 
 	viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
 
-	bool ok = viewer_app_ptr->init();
+	bool ok = viewer_app_ptr->tempStoreCommandOptions(argc, argv);
+	if(!ok)
+	{
+		llwarns << "Unable to parse command line." << llendl;
+		return -1;
+	}
+
+	ok = viewer_app_ptr->init();
 	if(!ok)
 	{
 		llwarns << "Application init failed." << llendl;
@@ -325,7 +321,7 @@ void LLAppViewerLinux::handleCrashReporting()
 			{(char*)cmd.c_str(),
 			 ask_dialog,
 			 (char*)"-user",
-			 (char*)gGridName.c_str(),
+			 (char*)gGridName,
 			 (char*)"-name",
 			 (char*)LLAppViewer::instance()->getSecondLifeTitle().c_str(),
 			 NULL};
@@ -407,12 +403,6 @@ bool LLAppViewerLinux::initLogging()
 	return LLAppViewer::initLogging();
 }
 
-bool LLAppViewerLinux::initParseCommandLine(LLCommandLineParser& clp)
-{
-	clp.parseCommandLine(gArgC, gArgV);
-	return true;
-}
-
 std::string LLAppViewerLinux::generateSerialNumber()
 {
 	char serial_md5[MD5HEX_STR_SIZE];