diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-10 10:44:21 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-10 10:44:21 -0500 |
| commit | e3ed1565f8c6eeff5d87f862465038aa98576fa9 (patch) | |
| tree | 4ab57c1658d589d802f1e6bb6ff3331b75b61074 /indra/newview/llcolorswatch.cpp | |
| parent | 952c3eaaa8c78d00ef62932d46af1d8fa565e7b2 (diff) | |
| parent | 76cb9a7796ffce930458aae00147f8dafa4b33fb (diff) | |
Automated merge up from viewer-development into mesh-development
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); } } |