From 7fbf42dec8bae638b62676c280b3f042f9458057 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 19 Apr 2012 14:52:44 -0400
Subject: 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

---
 indra/newview/llstartup.cpp | 3 +++
 1 file changed, 3 insertions(+)
 mode change 100644 => 100755 indra/newview/llstartup.cpp

(limited to 'indra/newview/llstartup.cpp')

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
old mode 100644
new mode 100755
index 3923b4510a..31343ee908
--- 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();
 }
 
-- 
cgit v1.3