From d75e1472c43357114b677ff66c1faffea0b73d27 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Wed, 9 Dec 2009 11:16:25 -0500
Subject: EXT-2819 crash in color picker in appearance editor

Made progress by writing code to match the style we use for the texture picker.
It now should not make a difference if you destroy the color picker floater or
the color swatch control first - either direction it should do sufficient cleanup
and protection. However, still getting this crash. Will investigate further later.

Code reviewed by Seraph

--HG--
branch : avatar-pipeline
---
 indra/newview/llfloatercolorpicker.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/llfloatercolorpicker.cpp')

diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp
index 73b79d8e13..56b56dc3d2 100644
--- a/indra/newview/llfloatercolorpicker.cpp
+++ b/indra/newview/llfloatercolorpicker.cpp
@@ -241,6 +241,16 @@ BOOL LLFloaterColorPicker::postBuild()
     return TRUE;
 }
 
+/*virtual*/ 
+void LLFloaterColorPicker::onClose(bool app_settings)
+{
+	if (mSwatch)
+	{
+		mSwatch->onFloaterClose();
+	}
+	stopUsingPipette();
+}
+
 //////////////////////////////////////////////////////////////////////////////
 //
 void LLFloaterColorPicker::initUI ( F32 rValIn, F32 gValIn, F32 bValIn )
-- 
cgit v1.2.3