Merge lindenlab/viewer-development => don_linden/viewer-horde-fixes

.hgtags

@@ -327,6 +327,7 @@ fdcc08a4f20ae9bb060f4693c8980d216534efdf 3.3.3-beta2
 af5f3e43e6e4424b1da19d9e16f6b853a7b822ed DRTVWR-169
 4b3c68199a86cabaa5d9466d7b0f7e141e901d7a 3.3.3-beta3
 6428242e124b523813bfaf4c45b3d422f0298c81 3.3.3-release
+57d221de3df94f90b55204313c2cef044a3c0ae2 DRTVWR-176
 09ef7fd1b0781f33b8a3a9af6236b7bcb4831910 DRTVWR-170
 005dfe5c4c377207d065fb27858d2eb0b53b143a DRTVWR-167
 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1

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);
 	}
 }