diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-11-11 15:54:06 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-11-11 15:54:06 -0800 |
| commit | 5f099265fc36c885122457edd87a1ec8c1a80873 (patch) | |
| tree | ea09410c65f2136932b5bf0d58ccbd20d6abfb4c /indra/newview/llappearancemgr.cpp | |
| parent | 76d708bdb5230aaeb9a15bb2fb475458d8bb996e (diff) | |
| parent | 20921d6a1a2e98fee750cb5a76adddb7266183f3 (diff) | |
Merge
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 |