summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorWolfpup Lowenhar <wolfpup67@earthlink.net>2010-11-11 22:37:51 -0500
committerWolfpup Lowenhar <wolfpup67@earthlink.net>2010-11-11 22:37:51 -0500
commit899f470deca2cbc775e87147852e0b118464896f (patch)
treebfee59a4141c4c60ffde94ff8ed6ed9a14d125a6 /indra/newview/llappearancemgr.cpp
parenteea9460ba5e18b081723a56d1d7d0bbf1f4edd85 (diff)
parent5f099265fc36c885122457edd87a1ec8c1a80873 (diff)
STORM-102: Merge from viewer-development
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