From fd4708c2c4f221d9f2029072f786e169e119ba1a Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Wed, 20 Jun 2012 13:37:38 -0700
Subject: MAINT-1150 FIX (Speculative) crash on (shutdown) in
 LLVOAvatar::avString() Reviewed by vir

---
 indra/newview/llappearancemgr.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index faadfb4b87..6d67e098a6 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -229,12 +229,13 @@ LLUpdateAppearanceOnDestroy::LLUpdateAppearanceOnDestroy(bool update_base_outfit
 
 LLUpdateAppearanceOnDestroy::~LLUpdateAppearanceOnDestroy()
 {
-	LL_INFOS("Avatar") << self_av_string() << "done update appearance on destroy" << LL_ENDL;
-
-	selfStopPhase("update_appearance_on_destroy");
-	
 	if (!LLApp::isExiting())
 	{
+		// speculative fix for MAINT-1150
+		LL_INFOS("Avatar") << self_av_string() << "done update appearance on destroy" << LL_ENDL;
+
+		selfStopPhase("update_appearance_on_destroy");
+
 		LLAppearanceMgr::instance().updateAppearanceFromCOF(mUpdateBaseOrder);
 	}
 }
-- 
cgit v1.2.3


From 02bb54273fdd577081d1d126c1495fd472f21c30 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Sun, 8 Jul 2012 16:39:03 -0400
Subject: tag merge of DRTVWR-176

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index fb5075caa2..07441c26ed 100644
--- a/.hgtags
+++ b/.hgtags
@@ -316,3 +316,4 @@ f0a174c2adb4bc39b16722a61d7eeb4f2a1d4843 DRTVWR-144
 fdcc08a4f20ae9bb060f4693c8980d216534efdf 3.3.3-beta2
 af5f3e43e6e4424b1da19d9e16f6b853a7b822ed DRTVWR-169
 4b3c68199a86cabaa5d9466d7b0f7e141e901d7a 3.3.3-beta3
+57d221de3df94f90b55204313c2cef044a3c0ae2 DRTVWR-176
-- 
cgit v1.2.3