diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:48:51 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:48:51 -0500 |
| commit | c44e7128212c52e8fb67a2573db4021ba400b32c (patch) | |
| tree | aa6c1d0f0786a37ec08ece818df23122ac0c4c60 /indra/newview/llpaneleditwearable.cpp | |
| parent | ec0eafbaa0e4c4fbf25bab31ed38d90e998e9dbd (diff) | |
| parent | a98b7003043c49bd687356843f3740f0a50ab258 (diff) | |
merge changes for storm-348
Diffstat (limited to 'indra/newview/llpaneleditwearable.cpp')
| -rw-r--r-- | indra/newview/llpaneleditwearable.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index 90ed8b9e58..4a74b7925c 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -569,6 +569,7 @@ static void update_color_swatch_ctrl(LLPanelEditWearable* self, LLPanel* panel, if (color_swatch_ctrl) { color_swatch_ctrl->set(self->getWearable()->getClothesColor(entry->mTextureIndex)); + color_swatch_ctrl->closeFloaterColorPicker(); } } |