summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2010-11-18 17:03:40 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2010-11-18 17:03:40 -0800
commite19ee531aedcbbe0f77a8ac11cdcda43c9c4ed84 (patch)
tree1c297e01c91d9aa851296cf371403daa0a243988 /indra/newview/llappearancemgr.cpp
parentcd30239eda5d8969db02c2c56d95332dd5039bb0 (diff)
parentc893c55d8a1328a134c956b70e6fef7fd7053d47 (diff)
merge
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r--indra/newview/llappearancemgr.cpp6
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