diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-28 17:05:11 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-28 17:05:11 -0500 |
| commit | b4b3f78c455a614d7738c29cdc6383e857d6028d (patch) | |
| tree | 84e35e9c1b2a05743b6236e9a7bfd14316169d13 /indra/newview/llcolorswatch.cpp | |
| parent | a9d023a4618e4e425d5d51e750374deebeff3bc0 (diff) | |
| parent | ee2678be57668844221a462ed1e215c3c7cbd841 (diff) | |
pull back fixes from beta
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) |