diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 18:27:38 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 18:27:38 +0000 |
| commit | 75aec285349747b09077b576c7ec15838c4132f2 (patch) | |
| tree | a3591f4c94cad07c1a44337a03d12355a94378cd /indra/newview/llappearancemgr.cpp | |
| parent | 7bb35543c1021c1a286a75684aeb5014eb104f4b (diff) | |
| parent | 594b1ac679a502f92db477e3f09441e361f72c93 (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..fa1bfdb5ab 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) |