diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-05 16:35:09 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-05 16:35:09 -0500 |
| commit | c3501a4f233410ca1740cbe0d29c3be18327ca52 (patch) | |
| tree | 8a1aa78d76435cbb4e8fe76c2eef81a79de272a0 /indra/llui | |
| parent | 3b1a06b02434377a2772def8cc8fc0bf3407837d (diff) | |
| parent | e2f197b6f77592c84d0c2967cc0e8110c79f2f49 (diff) | |
Automated merge from viewer-development
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(); |