diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:10:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:10:39 -0500 |
| commit | 7c7527b6727a6070fd7679ea28e4e2692452bf27 (patch) | |
| tree | 149af6391cf0e751488964871e8bfcf62adbb160 /indra/llui/llfloater.cpp | |
| parent | df1c6d2a2e4ccfe7bd19a66ba95c4f7bc6edee5e (diff) | |
| parent | e2f197b6f77592c84d0c2967cc0e8110c79f2f49 (diff) | |
Automated merge up from viewer-development
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(); |