diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:40:25 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:40:25 -0500 |
| commit | 67ced403e624599f23020c8b8bd802947e602d31 (patch) | |
| tree | 6fe5a73a41c30f3d718e9c4c1fe54fe940316d3b /indra/llui/llfloater.cpp | |
| parent | 67231c854e317e4439d350d7ea97245402b88b1c (diff) | |
| parent | 7a2f0ba9a8d7f6126d9c695d63f7efa65b479788 (diff) | |
merge changes for storm-513
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 4 |
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(); |