diff options
| author | prep <prep@lindenlab.com> | 2011-01-05 16:12:15 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-01-05 16:12:15 -0500 |
| commit | c9f3a5574e223bec95b4ec374fd164ba9a486c2a (patch) | |
| tree | edbd6574b4133488f82e872bb86d3aacda4af216 /indra/llui/llfloater.cpp | |
| parent | 5b09da5079d576678eb5d66a5518044d1b22664f (diff) | |
| parent | 7c7527b6727a6070fd7679ea28e4e2692452bf27 (diff) | |
merge
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(); |