diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:44:15 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:44:15 -0500 |
| commit | 562ed9c4d463ccb96dd4e6b23dff6ad6c845fc96 (patch) | |
| tree | e818a654c4c45cd9110164b932669cb5036c6e45 /indra/llui | |
| parent | 43659aac93ff5041bbf94bcaa66e88bc4b70a6cd (diff) | |
| parent | 05810f063dbe0ed87d03ea41c7d8fdc423945c6e (diff) | |
merge changes for storm-485
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(); |