diff options
| author | James Cook <james@lindenlab.com> | 2009-12-09 13:42:07 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-09 13:42:07 -0800 |
| commit | 7466aa198a7707f2acadacfb6709bed8351fff96 (patch) | |
| tree | 080671ab4d66607d0071e777993f1cb0c6356ec8 /indra/newview/llfloatercolorpicker.cpp | |
| parent | 1c0b5d4435e30dbfa5865ad212b3ca2a391d43ee (diff) | |
| parent | 6260ce6a9210192963a77e5b1f44b0d2c2c86591 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloatercolorpicker.cpp')
| -rw-r--r-- | indra/newview/llfloatercolorpicker.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp index 73b79d8e13..56b56dc3d2 100644 --- a/indra/newview/llfloatercolorpicker.cpp +++ b/indra/newview/llfloatercolorpicker.cpp @@ -241,6 +241,16 @@ BOOL LLFloaterColorPicker::postBuild() return TRUE; } +/*virtual*/ +void LLFloaterColorPicker::onClose(bool app_settings) +{ + if (mSwatch) + { + mSwatch->onFloaterClose(); + } + stopUsingPipette(); +} + ////////////////////////////////////////////////////////////////////////////// // void LLFloaterColorPicker::initUI ( F32 rValIn, F32 gValIn, F32 bValIn ) |