diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:23:48 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:23:48 -0500 |
| commit | bb3be2c07f492577254ae9ace5675eb92d10f061 (patch) | |
| tree | 038a59de9284c528bf5c51d1dab851f23ecbc444 /indra/newview/llpaneleditwearable.cpp | |
| parent | e3e1d9b4c3446ea87d1938d1cb0c4a5a9e5d448d (diff) | |
| parent | bca2b9a053b1358435b57e0c7a59866702644844 (diff) | |
merge changes for storm-715
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(); } } |