From d75e1472c43357114b677ff66c1faffea0b73d27 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" 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.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfloatercolorpicker.h') diff --git a/indra/newview/llfloatercolorpicker.h b/indra/newview/llfloatercolorpicker.h index a16cde7f10..b381740acd 100644 --- a/indra/newview/llfloatercolorpicker.h +++ b/indra/newview/llfloatercolorpicker.h @@ -56,6 +56,7 @@ class LLFloaterColorPicker // overrides virtual BOOL postBuild (); + virtual void onClose(bool app_settings); virtual void draw (); virtual BOOL handleMouseDown ( S32 x, S32 y, MASK mask ); virtual BOOL handleMouseUp ( S32 x, S32 y, MASK mask ); @@ -69,6 +70,7 @@ class LLFloaterColorPicker void destroyUI (); void cancelSelection (); LLColorSwatchCtrl* getSwatch () { return mSwatch; }; + void setSwatch( LLColorSwatchCtrl* swatch) { mSwatch = swatch; } // mutator / accessor for original RGB value void setOrigRgb ( F32 origRIn, F32 origGIn, F32 origBIn ); -- cgit v1.2.3 From 6b0c1f97f4c1c24d786d2d1a0171b883d21f447b Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 10 Dec 2009 11:01:32 -0500 Subject: EXT-2819 : Crash in appearance color picker Enforcing out-of-order destruction in llfloatercustomize to avoid this crash. --- indra/newview/llfloatercolorpicker.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llfloatercolorpicker.h') diff --git a/indra/newview/llfloatercolorpicker.h b/indra/newview/llfloatercolorpicker.h index b381740acd..0bbbe2051c 100644 --- a/indra/newview/llfloatercolorpicker.h +++ b/indra/newview/llfloatercolorpicker.h @@ -56,7 +56,6 @@ class LLFloaterColorPicker // overrides virtual BOOL postBuild (); - virtual void onClose(bool app_settings); virtual void draw (); virtual BOOL handleMouseDown ( S32 x, S32 y, MASK mask ); virtual BOOL handleMouseUp ( S32 x, S32 y, MASK mask ); -- cgit v1.2.3