diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:55:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:55:55 -0500 |
| commit | d034d8d9289a9e5511d32ec048b75837b89264ad (patch) | |
| tree | c3fd25eb7d1096baef0290b5bf86321f7ed447ad /indra/newview/llcolorswatch.cpp | |
| parent | 6150e4ed7cf86a2afc0061ba89b0cb049d6f036e (diff) | |
| parent | 97a9211d87fac90994846e5bf91a78a708ec5a9c (diff) | |
merge changes for vwr-24347
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) |