summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatercolorpicker.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-01-09 10:05:07 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-01-09 10:05:07 -0800
commit9ff4265baff19984096533f9dbd51ec255d9960c (patch)
tree1cce734a7f7ac04a0aaa248adc7aa9fcfb6bc687 /indra/newview/llfloatercolorpicker.cpp
parent7236b1f4f8b3c14fe18af3d0bd5ee131ea7103dc (diff)
parent3dfb1536fa3bb85f6648a76591e80c3feea9eb83 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llfloatercolorpicker.cpp')
-rw-r--r--indra/newview/llfloatercolorpicker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp
index 659e52271a..05d73c2416 100644
--- a/indra/newview/llfloatercolorpicker.cpp
+++ b/indra/newview/llfloatercolorpicker.cpp
@@ -271,7 +271,7 @@ void LLFloaterColorPicker::destroyUI ()
if ( mSwatchView )
{
this->removeChild ( mSwatchView );
- delete mSwatchView;
+ mSwatchView->die();;
mSwatchView = NULL;
}
}