diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:31:17 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:31:17 -0500 |
| commit | a9686db3e606ec45d23265fd34a1a35498f39857 (patch) | |
| tree | b20758ac0beda679834eafbcdd203780449be334 /indra/llui | |
| parent | 7105d98e24185f9ce31be1fe1b26c3ae1552e71f (diff) | |
| parent | 1034db639462d95e54e9bf9e4d63500b745bb0a2 (diff) | |
merge changes for storm-438
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(); |