diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-08 17:21:06 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-08 17:21:06 -0400 |
| commit | ed21e67a3869e34675641d64cbf5464abe2749c5 (patch) | |
| tree | def34525578b23e606b9cca5a1ca22f83b27abae /indra | |
| parent | ed5b46c9b0f71b458f8dd58a9c76ae51f974726b (diff) | |
| parent | fd4708c2c4f221d9f2029072f786e169e119ba1a (diff) | |
merge changes for DRTVWR-176
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); } } |