diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-09 11:16:43 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-09 11:16:43 -0500 |
| commit | e6f1604549f90ad92a5556a84d3c609f3b683069 (patch) | |
| tree | 5340d873c7d57a3dcdb7834261bea98324087f95 /indra/newview/llfloatercolorpicker.cpp | |
| parent | cb88b7f4a41f66249129eaa9b173ec8c206a3958 (diff) | |
| parent | d75e1472c43357114b677ff66c1faffea0b73d27 (diff) | |
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--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 ) |