summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-01-19 11:39:25 -0800
committerleyla_linden <none@none>2011-01-19 11:39:25 -0800
commit17068766b75fbe7dac968705f4f383fb61f73eb4 (patch)
tree9a6923653b721311b61edac947b2e7682972cce3 /indra/llui/llfloater.cpp
parentca1c1eea78ff2ab83979a4308dd5a93ea0032fc8 (diff)
parenteec6071766e6fef7015610b002a9bcb09ce36836 (diff)
Merge
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index d30697e178..c425782715 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -272,9 +272,6 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
initFromParams(p);
- // chrome floaters don't take focus at all
- setFocusRoot(!getIsChrome());
-
initFloater(p);
}
@@ -2910,8 +2907,6 @@ 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);