summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-04-19 14:52:44 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-04-19 14:52:44 -0400
commit7fbf42dec8bae638b62676c280b3f042f9458057 (patch)
tree28949f9335c16f4e814bd3607383a24ab770427f /indra/newview/llstartup.cpp
parentadf5b5c1efaed30dc043652b174d76c9088f4b18 (diff)
Move phase tracking to its own set of classes inside LLViewerStats - simplifies llvoavatar and allows adding such tracking to classes that live outside the avatar lifetime
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/llstartup.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 3923b4510a..31343ee908 100644..100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2706,7 +2706,10 @@ void LLStartUp::setStartupState( EStartupState state )
LL_INFOS("AppInit") << "Startup state changing from " <<
getStartupStateString() << " to " <<
startupStateToString(state) << LL_ENDL;
+
+ selfStopPhase(getStartupStateString());
gStartupState = state;
+ selfStartPhase(getStartupStateString());
postStartupState();
}