diff options
| author | callum <none@none> | 2010-11-15 17:21:27 -0800 |
|---|---|---|
| committer | callum <none@none> | 2010-11-15 17:21:27 -0800 |
| commit | b4efcccce7438a72078c02dd404080d6dee37622 (patch) | |
| tree | 6d4890e3ace464bba7c81d3235ab799538080b02 /indra/newview/llappearancemgr.cpp | |
| parent | a52e06d209925d1942230e8c129d8b19af7b88b5 (diff) | |
| parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) | |
Merge with tip of of viewer-development (http://hg.secondlife.com/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 |