summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorcallum <none@none>2011-01-05 15:52:43 -0800
committercallum <none@none>2011-01-05 15:52:43 -0800
commitb9ca6c553cf158c5b485947f8b560228a196c1d7 (patch)
treedf710eb467a1c0fbfb5d7906232f23a36f6fc7c1 /indra/llui
parented3ea14984e322462ed466805e47b29a6f658279 (diff)
parentd5a0c56bf5d933b7cee072cbc1851a626e672ded (diff)
Merge with viewer-development
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llfloater.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 1265733bf5..d30697e178 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2910,7 +2910,9 @@ bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::str
params.from_xui = true;
applyXUILayout(params, parent);
initFromParams(params);
-
+ // chrome floaters don't take focus at all
+ setFocusRoot(!getIsChrome());
+
initFloater(params);
LLMultiFloater* last_host = LLFloater::getFloaterHost();