From afe61eb994377e25d60d0a0893510a693149c6be Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 23 Sep 2008 01:53:11 +0000 Subject: QAR-849 merge maint-viewer-10-merge 96838-97237 -> release --- indra/newview/llappviewer.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/newview/llappviewer.h') diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 2415790973..a43fc56e51 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -135,15 +135,18 @@ public: void resumeMainloopTimeout(const std::string& state = "", F32 secs = -1.0f); void pingMainloopTimeout(const std::string& state, F32 secs = -1.0f); + protected: virtual bool initWindow(); // Initialize the viewer's window. virtual bool initLogging(); // Initialize log files, logging system, return false on failure. virtual void initConsole() {}; // Initialize OS level debugging console. virtual bool initHardwareTest() { return true; } // A false result indicates the app should quit. + virtual bool initSLURLHandler(); + virtual bool sendURLToOtherInstance(const std::string& url); - virtual bool initParseCommandLine(LLCommandLineParser& clp) + virtual bool initParseCommandLine(LLCommandLineParser& clp) { return true; } // Allow platforms to specify the command line args. - + virtual std::string generateSerialNumber() = 0; // Platforms specific classes generate this. -- cgit v1.2.3