diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-02-08 22:26:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-02-08 22:26:03 -0800 |
| commit | e58cbfa53ee62a53e19e7160d741e84e2a8ee67d (patch) | |
| tree | 196b40fc9f33e64c4799a113e04b8b6d09c5c4f3 /indra/newview | |
| parent | 300c79e7af3d8fa6d062a8503051a63954fa511b (diff) | |
| parent | 2c911fce8adf5b7438defbb235f6826c59b85bdf (diff) | |
STORM-601 : pull into viewer-development
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llcolorswatch.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp index 6f02192d0a..d77ebc5367 100644 --- a/indra/newview/llcolorswatch.cpp +++ b/indra/newview/llcolorswatch.cpp @@ -185,6 +185,10 @@ BOOL LLColorSwatchCtrl::handleMouseUp(S32 x, S32 y, MASK mask) llassert(getEnabled()); llassert(getVisible()); + // Focus the widget now in order to return the focus + // after the color picker is closed. + setFocus(TRUE); + showPicker(FALSE); } } |