diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-17 13:53:47 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-17 13:53:47 -0800 |
| commit | e0b4a1f7acd72de69ca4ef0b44767373c93c13f9 (patch) | |
| tree | 32026290f8f42ef2b220f3b18877e2b05058ee48 /indra/llui/llfloater.cpp | |
| parent | fdf774f51fd24bb62d1e1fc580bd04df4547b9f8 (diff) | |
| parent | e05449e7fe5e39f61c45504e27e109ffb4b68195 (diff) | |
merging
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -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; } |