diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
| commit | de83bd5c6b1e103993ba74321d600f1c413785ce (patch) | |
| tree | 7a93bec47e33227541abda9ea80b7b094c8be549 /indra/newview/llpaneleditwearable.cpp | |
| parent | f57aa3e83f1b4286b1d6b5cc8bca20fb924cb002 (diff) | |
| parent | 295536ae98cb88bfa551ac73ae2e19a8c2ddfc88 (diff) | |
merge changes for beta fixes
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(); } } |