summaryrefslogtreecommitdiff
path: root/indra/newview/llcolorswatch.cpp
diff options
context:
space:
mode:
authorPaul Guslisty <pguslisty@productengine.com>2011-01-14 18:10:46 +0200
committerPaul Guslisty <pguslisty@productengine.com>2011-01-14 18:10:46 +0200
commit8864a1b4db54b1ae5b335dec6372ee763b05ece9 (patch)
tree65599b56f7ae8d24873592a9d95277c2628fc14b /indra/newview/llcolorswatch.cpp
parent939e8d8f74687e7cb857c55bb6a8082226f1202b (diff)
STORM-834 FIXED Color picker remains opened after 'Undo changes' button was pressed on 'Edit weareble' panel
- Close color picker after color swatch's value updated
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
-rw-r--r--indra/newview/llcolorswatch.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp
index 4a1ba6f1b5..6f02192d0a 100644
--- a/indra/newview/llcolorswatch.cpp
+++ b/indra/newview/llcolorswatch.cpp
@@ -319,7 +319,7 @@ void LLColorSwatchCtrl::onColorChanged ( void* data, EColorPickOp pick_op )
// This is called when the main floatercustomize panel is closed.
// Since this class has pointers up to its parents, we need to cleanup
// this class first in order to avoid a crash.
-void LLColorSwatchCtrl::onParentFloaterClosed()
+void LLColorSwatchCtrl::closeFloaterColorPicker()
{
LLFloaterColorPicker* pickerp = (LLFloaterColorPicker*)mPickerHandle.get();
if (pickerp)