diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:11:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:11:20 -0500 |
| commit | 2d6228b4e0454c7d82770748eb572258c402319c (patch) | |
| tree | 5919547744782d0b7179d5fee77c12efc7c619ec /indra/newview/llcolorswatch.cpp | |
| parent | f91a9c87e5e758ecd32111d901ff32d282b73fa7 (diff) | |
| parent | bb3be2c07f492577254ae9ace5675eb92d10f061 (diff) | |
merge changes for storm-874/ER-428: fix lost movement updates when walking
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) |