diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-20 20:48:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-20 20:48:16 -0500 |
| commit | 4f3953763de478b15ec6adc5c468b19a0e13bfe8 (patch) | |
| tree | df9926a8ef0446a44bbb07126dafb7345760fd8c /indra/llui/llfloater.cpp | |
| parent | f9b9c7a5816cf0b9627a4a50e73a663667937145 (diff) | |
| parent | c47ab36b20e102a918257e5fa5452f13bc55a393 (diff) | |
merge changes from viewer-beta
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 5 |
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); |