diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-17 21:45:01 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-17 21:45:01 -0800 |
| commit | a5813e72cfc989747df5724e28c0f25541b75ba5 (patch) | |
| tree | e7b4e1d209550d08c5d51f83db28f7f8a2b15f2a /indra/llui | |
| parent | aabfce7d9f14ff18ea073708d79c6f62118b3453 (diff) | |
| parent | d0235ad1789d05524065307f4514a76d55f4e847 (diff) | |
Pull from lindenlab/viewer-chui
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 8f9be5285d..d2aae11191 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -655,7 +655,7 @@ void LLFloater::openFloater(const LLSD& key) { llinfos << "Opening floater " << getName() << llendl; mKey = key; // in case we need to open ourselves again - + if (getSoundFlags() != SILENT // don't play open sound for hosted (tabbed) windows && !getHost() @@ -2394,6 +2394,11 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus) { if (mFrontChild == child) { + + if (give_focus && !gFocusMgr.childHasKeyboardFocus(child)) + { + child->setFocus(TRUE); + } return; } |