diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-08 16:39:54 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-08 16:39:54 -0400 |
| commit | 13f7afbd7d91db0ab5b2f1e3bf7b894bbdd48e7a (patch) | |
| tree | 1f26ebd62594f000aa5a7d85952d73d25a1ce831 | |
| parent | 077e851bdd8e46fa9d5a43712dacdf5945a979f7 (diff) | |
| parent | 02bb54273fdd577081d1d126c1495fd472f21c30 (diff) | |
merge changes for DRTVWR-176
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 9 |
2 files changed, 6 insertions, 4 deletions
@@ -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 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 DRTVWR-158 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); } } |