diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
commit | 187b21e6d22204e8989b1c7d5e75f8b7880dd79f (patch) | |
tree | 8f60e069433afa48fc9a20ecc165863a0108c1aa /indra/newview/llappearancemgr.cpp | |
parent | e3677f9ee2223cc13d12456e1eee4f7f9a90c474 (diff) | |
parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r-- | indra/newview/llappearancemgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 62074ddcd5..4e0bfb2e22 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -2437,6 +2437,12 @@ public: virtual ~LLShowCreatedOutfit() { + if (!LLApp::isRunning()) + { + llwarns << "called during shutdown, skipping" << llendl; + return; + } + LLSD key; //EXT-7727. For new accounts LLShowCreatedOutfit is created during login process |