diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:32:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:32:57 -0500 |
| commit | cb6d59513eabe72029821a96191873351fd5c753 (patch) | |
| tree | ed311d11da22ab8d1aff695166d0ca38d269ccae /indra/llui/llfloater.cpp | |
| parent | d0b5e6b0b4acebd1b11685dea290b830957ba9dc (diff) | |
| parent | bbb4fb10a50495669ec5d49da4a39950a5e2042d (diff) | |
merge changes for storm-829
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); |