diff options
author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/newview/llstartup.h | |
parent | 1.1 version final (diff) | |
parent | Merge branch 'sl-base-1.22' into next (diff) | |
download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz |
Moved base up to 1.22
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llstartup.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h index 1a9f659..cde9a1a 100644 --- a/linden/indra/newview/llstartup.h +++ b/linden/indra/newview/llstartup.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2004&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2004&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2004-2008, Linden Research, Inc. | 7 | * Copyright (c) 2004-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -87,6 +87,7 @@ public: | |||
87 | // Always use this to set gStartupState so changes are logged | 87 | // Always use this to set gStartupState so changes are logged |
88 | static void setStartupState( EStartupState state ); | 88 | static void setStartupState( EStartupState state ); |
89 | static EStartupState getStartupState() { return gStartupState; }; | 89 | static EStartupState getStartupState() { return gStartupState; }; |
90 | static std::string getStartupStateString() { return startupStateToString(gStartupState); }; | ||
90 | 91 | ||
91 | static void multimediaInit(); | 92 | static void multimediaInit(); |
92 | // Initialize LLViewerMedia multimedia engine. | 93 | // Initialize LLViewerMedia multimedia engine. |