From 1fa673fa168821698f1f278190f19ad179c2667f Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 4 May 2010 17:25:27 -0400
Subject: EXT-7214 : FIXED : Add debug setting to show avatar rez times

Changed from #define to debug setting "DebugAvatarRezTime".
---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llvoavatar.cpp            | 19 +++++++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d689822e4e..db5da4c9e5 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1652,6 +1652,17 @@
       <key>Value</key>
       <string />
     </map>
+	<key>DebugAvatarRezTime</key>
+	<map>
+		<key>Comment</key>
+		<string>Display times for avatars to resolve.</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>0</integer>
+	</map>
     <key>DebugBeaconLineWidth</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c15fd563ae..674e4b6d82 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -102,8 +102,6 @@
 
 #include <boost/lexical_cast.hpp>
 
-#define DISPLAY_AVATAR_LOAD_TIMES
-
 using namespace LLVOAvatarDefines;
 
 //-----------------------------------------------------------------------------
@@ -5892,16 +5890,17 @@ BOOL LLVOAvatar::processFullyLoadedChange(bool loading)
 	
 	mFullyLoaded = (mFullyLoadedTimer.getElapsedTimeF32() > PAUSE);
 
-#ifdef DISPLAY_AVATAR_LOAD_TIMES
-	if (!mPreviousFullyLoaded && !loading && mFullyLoaded)
+	if (gSavedSettings.getBOOL("DebugAvatarRezTime"))
 	{
-		llinfos << "Avatar '" << getFullname() << "' resolved in " << mRuthDebugTimer.getElapsedTimeF32() << " seconds." << llendl;
-		LLSD args;
-		args["TIME"] = llformat("%d",(U32)mRuthDebugTimer.getElapsedTimeF32());
-		args["NAME"] = getFullname();
-		LLNotificationsUtil::add("AvatarRezNotification",args);
+		if (!mPreviousFullyLoaded && !loading && mFullyLoaded)
+		{
+			llinfos << "Avatar '" << getFullname() << "' resolved in " << mRuthDebugTimer.getElapsedTimeF32() << " seconds." << llendl;
+			LLSD args;
+			args["TIME"] = llformat("%d",(U32)mRuthDebugTimer.getElapsedTimeF32());
+			args["NAME"] = getFullname();
+			LLNotificationsUtil::add("AvatarRezNotification",args);
+		}
 	}
-#endif
 
 	// did our loading state "change" from last call?
 	const S32 UPDATE_RATE = 30;
-- 
cgit v1.2.3