summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-11 09:29:30 -0500
committerOz Linden <oz@lindenlab.com>2010-11-11 09:29:30 -0500
commit20921d6a1a2e98fee750cb5a76adddb7266183f3 (patch)
tree8966865c6484af39f1d2af276f961f0999e49a3f /indra/newview/llappearancemgr.cpp
parentb5df1d2abcef04ee5f491a7414189f4e82faaa1e (diff)
parentfc22e2cf5bfc97caaf1ad69814b7dd217cbafef0 (diff)
merge performance data tracking system STORM-104
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