merge release@82383 viewer-cleanup2-7-merge@82828

QAR-369

1 files changed, 6 insertions, 3 deletions

diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h
index 23e7337618..66653c48f5 100644
--- a/indra/newview/llappviewerwin32.h
+++ b/indra/newview/llappviewerwin32.h
@@ -39,7 +39,7 @@
 class LLAppViewerWin32 : public LLAppViewer
 {
 public:
-	LLAppViewerWin32();
+	LLAppViewerWin32(const char* cmd_line);
 	virtual ~LLAppViewerWin32();
 
 	//
@@ -49,15 +49,18 @@ public:
 	virtual bool cleanup();
 
 protected:
-	virtual bool initWindow(); // Initialize the viewer's window.
+	virtual void initConsole(); // Initialize OS level debugging console.
 	virtual bool initHardwareTest(); // Win32 uses DX9 to test hardware.
-	virtual void handleCrashReporting(); 
+    virtual bool initParseCommandLine(LLCommandLineParser& clp);
+
+    virtual void handleCrashReporting(); 
 
 	std::string generateSerialNumber();
 
 private:
 	void disableWinErrorReporting();
 
+    std::string mCmdLine;
 };
 
 #endif // LL_LLAPPVIEWERWIN32_H