From 594b1ac679a502f92db477e3f09441e361f72c93 Mon Sep 17 00:00:00 2001 From: "Eric M. Tulla (BigPapi)" Date: Wed, 3 Feb 2010 11:42:03 -0500 Subject: EXT-4868: Callback was getting triggered at shutdown, leading to crash. Now test isExiting() first. -Reviewed by vir --- indra/newview/llappearancemgr.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llappearancemgr.cpp') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 5088c65122..fa1bfdb5ab 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -279,7 +279,10 @@ public: virtual ~LLUpdateAppearanceOnDestroy() { - LLAppearanceManager::instance().updateAppearanceFromCOF(); + if (!!LLApp::isExiting()) + { + LLAppearanceManager::instance().updateAppearanceFromCOF(); + } } /* virtual */ void fire(const LLUUID& inv_item) -- cgit v1.2.3 From 9df8583ea8fd242e8f71710a62841d265d090d4c Mon Sep 17 00:00:00 2001 From: "Eric M. Tulla (BigPapi)" Date: Wed, 3 Feb 2010 14:01:36 -0500 Subject: Moss rocks! Thanks for noticeing the paste error that resulted in a double \'\!\' bool op. --- indra/newview/llappearancemgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llappearancemgr.cpp') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index fa1bfdb5ab..585d42f66d 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -279,7 +279,7 @@ public: virtual ~LLUpdateAppearanceOnDestroy() { - if (!!LLApp::isExiting()) + if (!LLApp::isExiting()) { LLAppearanceManager::instance().updateAppearanceFromCOF(); } -- cgit v1.2.3