diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 16:54:28 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 16:54:28 +0000 |
| commit | 21db952361d12f2118d9c02e54e30e67e7163e96 (patch) | |
| tree | e99dd7d354ba59cfb30c988dfead3c2f1f0f4c28 | |
| parent | a171848fd4fed2fe915bcb42de96359112cf95e1 (diff) | |
| parent | 594b1ac679a502f92db477e3f09441e361f72c93 (diff) | |
merge from viewer2
| -rw-r--r-- | indra/newview/llagentwearables.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index b0ff3a5626..3249d0b31f 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -2300,7 +2300,7 @@ public: virtual ~LLLibraryOutfitsCopyDone() { - if (mLibraryOutfitsFetcher) + if (!!LLApp::isExiting() && mLibraryOutfitsFetcher) { gInventory.addObserver(mLibraryOutfitsFetcher); mLibraryOutfitsFetcher->done(); 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) |