diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:50:40 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:50:40 -0500 |
| commit | 856a6992ebb0989e5d143d987a3e9ba79bb6492e (patch) | |
| tree | 030b791d9b0d0622ab90ef7e19d6d038eaf80260 /indra/newview/llcolorswatch.cpp | |
| parent | 0d93ce2e4a3daabc8d653290e39b67e5cddabb14 (diff) | |
| parent | b7c49f0f47f53d200df5afe4a4b68a83dd789918 (diff) | |
pull latest changes from viewer-vs2010
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
| -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); } } |