diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:39:53 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:39:53 -0500 |
| commit | 7a2f0ba9a8d7f6126d9c695d63f7efa65b479788 (patch) | |
| tree | 1df00e7883b28b4afd2f84d3d9e3b3d49de90975 /indra/llui | |
| parent | c3270fea7442e9bfb5c3100974afc285d84568d6 (diff) | |
| parent | 69b6aa5db2034e8e34bd234a4ebf04763419933a (diff) | |
merge changes for storm-493
Diffstat (limited to 'indra/llui')
| -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(); |