diff options
| author | leyla_linden <none@none> | 2011-01-06 16:43:57 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-01-06 16:43:57 -0800 |
| commit | 523722652259d37841be2ad4ad283df4887ad372 (patch) | |
| tree | 3872f4235183254667bb0452ff5faf6554c7c69c /indra/llui | |
| parent | f243f7e550b9dadd26d119bfeb4b215aa809997c (diff) | |
| parent | d8cf705d0189ec34b1202ee50ea3e5991cf4c90f (diff) | |
Merge
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(); |