diff options
| author | Don Kjer <don@lindenlab.com> | 2012-07-09 19:46:43 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-07-09 19:46:43 +0000 |
| commit | 29385890a412ba7cfbd4ca89b7a2e32c05aab97d (patch) | |
| tree | 2c4ccdca59f9b036140624012570f938f3665f9a /indra | |
| parent | bc2517215cbf79cdf8a910e93cc5d3f2ac1534c7 (diff) | |
| parent | 9298b1abe9f8b5a7230a5788e86affb22747740d (diff) | |
Merge lindenlab/viewer-development => don_linden/viewer-horde-fixes
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 9 |
1 files 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); } } |