diff options
| author | Don Kjer <don@lindenlab.com> | 2011-01-12 19:00:36 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-01-12 19:00:36 -0800 |
| commit | 756a4e26da6cec82d48a71d05b1f43623b56313d (patch) | |
| tree | 4dfa615e17c7941114679643e1aa5a2875583f29 /indra/llui/llfloater.cpp | |
| parent | d8b4363c1d3f60741422419b386b79df23a6da6a (diff) | |
| parent | 55322713fc071a3e171fd4cfbea989945dc8d084 (diff) | |
Merge with viewer-development
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); |