diff options
author | callum <none@none> | 2012-06-20 13:37:38 -0700 |
---|---|---|
committer | callum <none@none> | 2012-06-20 13:37:38 -0700 |
commit | fd4708c2c4f221d9f2029072f786e169e119ba1a (patch) | |
tree | 97ca2f452d1653a8c52eece30de6061d5499f427 /indra/newview | |
parent | 1d23a8600c0d849cd540d2f3824df98cf1a7b877 (diff) |
MAINT-1150 FIX (Speculative) crash on (shutdown) in LLVOAvatar::avString()
Reviewed by vir
Diffstat (limited to 'indra/newview')
-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); } } |