diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
commit | 4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (patch) | |
tree | de6ce52d54764b0cf7d0c33d17d1cd7e71ffad1b /indra/newview/llcolorswatch.cpp | |
parent | 3571e83b6413e0c1050540a6cddeeaa7c6ca91c1 (diff) | |
parent | 2d6228b4e0454c7d82770748eb572258c402319c (diff) |
merge changes for storm-869
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
-rw-r--r-- | indra/newview/llcolorswatch.cpp | 2 |
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) |