aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstartup.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llstartup.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index d9adc62..ad27b28 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -2,6 +2,8 @@
2 * @file llstartup.h 2 * @file llstartup.h
3 * @brief startup routines and logic declaration 3 * @brief startup routines and logic declaration
4 * 4 *
5 * $LicenseInfo:firstyear=2004&license=viewergpl$
6 *
5 * Copyright (c) 2004-2007, Linden Research, Inc. 7 * Copyright (c) 2004-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29#ifndef LL_LLSTARTUP_H 32#ifndef LL_LLSTARTUP_H
@@ -84,6 +87,14 @@ public:
84 static void setStartupState( S32 state ); 87 static void setStartupState( S32 state );
85 static S32 getStartupState() { return gStartupState; }; 88 static S32 getStartupState() { return gStartupState; };
86 89
90 static bool dispatchURL();
91 // if we have a SLURL or sim string ("Ahern/123/45") that started
92 // the viewer, dispatch it
93
94 static std::string sSLURLCommand;
95 // *HACK: On startup, if we were passed a secondlife://app/do/foo
96 // command URL, store it for later processing.
97
87protected: 98protected:
88 static S32 gStartupState; // Do not set directly, use LLStartup::setStartupState 99 static S32 gStartupState; // Do not set directly, use LLStartup::setStartupState
89}; 100};