diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-09 15:50:40 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-09 15:50:40 -0500 |
| commit | 4a7c31ee1d63db068eeef3bd2f5fc0cf61247f69 (patch) | |
| tree | e72c72ae02411679cc5460b776be6265fb80bd9e /indra/newview/llfloatercolorpicker.cpp | |
| parent | f7215a5d7cb4f6431bbd63c42617b0a3dd207ac3 (diff) | |
| parent | 019fc578550fd93eb404dd1ddab2b629bd0688fe (diff) | |
avp->avp merge
--HG--
branch : avatar-pipeline
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 ) |