diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-22 06:03:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-22 06:03:42 -0400 |
| commit | 7637acf76e6a1170508e8bddd381c426d219b1ee (patch) | |
| tree | c48b5ea58fda587a103278860b943122f6ce8fae /indra/newview/llstartup.cpp | |
| parent | 6525fc4a4fc09e02c4fa709e0cbba4aa8d7d25ae (diff) | |
| parent | c4dfdcb338aaeeb4e3adc4e1aef4f5b190ef5c57 (diff) | |
merge changes for DRTVWR-149
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llstartup.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 0ac8c1fe39..6b0fc26db7 100644..100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -240,6 +240,7 @@ static bool mLoginStatePastUI = false; boost::scoped_ptr<LLEventPump> LLStartUp::sStateWatcher(new LLEventStream("StartupState")); boost::scoped_ptr<LLStartupListener> LLStartUp::sListener(new LLStartupListener()); +boost::scoped_ptr<LLViewerStats::PhaseMap> LLStartUp::sPhases(new LLViewerStats::PhaseMap); // // local function declaration @@ -2705,7 +2706,10 @@ void LLStartUp::setStartupState( EStartupState state ) LL_INFOS("AppInit") << "Startup state changing from " << getStartupStateString() << " to " << startupStateToString(state) << LL_ENDL; + + sPhases->stopPhase(getStartupStateString()); gStartupState = state; + sPhases->startPhase(getStartupStateString()); postStartupState(); } |