diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-27 13:01:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 13:01:55 -0500 |
| commit | 3ef1a5a5d2334a0cd498e959b983e0cdf626eaef (patch) | |
| tree | a461ec6fc7412cff158635afffb0c4336fcac470 /indra/newview/llpaneleditwearable.cpp | |
| parent | 3c1cafeac1312ec37ba80853e1b04e5768c20738 (diff) | |
| parent | 3eba59e963d87f54e1b33b0a34de3fe37e67ebe1 (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(); } } |