diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-10 19:02:32 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-10 19:02:32 +0200 |
| commit | 3e13bc913f3e527b1a9d4f500ad038c06cdf6525 (patch) | |
| tree | 3e93416b19e77afdd834a581206ddcad99dc8a58 /indra/newview/llfloatercolorpicker.cpp | |
| parent | f11c6044562571d42c76abede6fa90db2b08493f (diff) | |
| parent | 6a59342963aaf4188d1c1b104d71c31eae027d2b (diff) | |
merge
--HG--
branch : product-engine
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 ) |