diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-04 15:45:24 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-04 15:45:24 +0200 |
| commit | 0ae5368cc61f8ce95a186e6c2268b1e0a8d59c14 (patch) | |
| tree | 2beb159778842156fad344e55ce8e00de397b6d2 /indra/newview/llappearancemgr.cpp | |
| parent | 36a44ba0e9133e78cc66f7d0b65d0890cfeb3db5 (diff) | |
| parent | 56ca1aebb866b7d7e1526e31797dd7e07fcb74a8 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 5088c65122..585d42f66d 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -279,7 +279,10 @@ public: virtual ~LLUpdateAppearanceOnDestroy() { - LLAppearanceManager::instance().updateAppearanceFromCOF(); + if (!LLApp::isExiting()) + { + LLAppearanceManager::instance().updateAppearanceFromCOF(); + } } /* virtual */ void fire(const LLUUID& inv_item) |