Skip to content
Snippets Groups Projects
Commit 70600ea6 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

Make setStartupState() fling events on "StartupState" LLEventPump

parent 116628bb
No related branches found
No related tags found
No related merge requests found
...@@ -186,6 +186,7 @@ ...@@ -186,6 +186,7 @@
#include "llinventorybridge.h" #include "llinventorybridge.h"
#include "lllogin.h" #include "lllogin.h"
#include "llevents.h"
#if LL_LIBXUL_ENABLED #if LL_LIBXUL_ENABLED
#include "llmozlib.h" #include "llmozlib.h"
...@@ -234,6 +235,7 @@ static std::string gFirstSimSeedCap; ...@@ -234,6 +235,7 @@ static std::string gFirstSimSeedCap;
static LLVector3 gAgentStartLookAt(1.0f, 0.f, 0.f); static LLVector3 gAgentStartLookAt(1.0f, 0.f, 0.f);
static std::string gAgentStartLocation = "safe"; static std::string gAgentStartLocation = "safe";
static LLEventStream sStartupStateWatcher("StartupState");
// //
// local function declaration // local function declaration
...@@ -2637,14 +2639,17 @@ std::string LLStartUp::startupStateToString(EStartupState state) ...@@ -2637,14 +2639,17 @@ std::string LLStartUp::startupStateToString(EStartupState state)
#undef RTNENUM #undef RTNENUM
} }
// static // static
void LLStartUp::setStartupState( EStartupState state ) void LLStartUp::setStartupState( EStartupState state )
{ {
LL_INFOS("AppInit") << "Startup state changing from " << LL_INFOS("AppInit") << "Startup state changing from " <<
startupStateToString(gStartupState) << " to " << getStartupStateString() << " to " <<
startupStateToString(state) << LL_ENDL; startupStateToString(state) << LL_ENDL;
gStartupState = state; gStartupState = state;
LLSD stateInfo;
stateInfo["str"] = getStartupStateString();
stateInfo["enum"] = state;
sStartupStateWatcher.post(stateInfo);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment