diff options
| author | Richard Linden <none@none> | 2011-01-11 16:56:05 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-01-11 16:56:05 -0800 |
| commit | 7a1d7d15b9658b6bde224bd87e476ac152925413 (patch) | |
| tree | 38f638a04563570c7f9c9481765f5cca5ca27ab9 /indra | |
| parent | aab5759467a4d24aaebbdc95f052fbcb46826657 (diff) | |
STORM-823 FIX Tab Key not working properly
set focus root to true by default for all floaters via floater.xml template
existing calls to setIsChrome will turn off focus root for chrome floaters after initializing it from the focus_root parameter
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llfloater.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/floater.xml | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index d30697e178..c425782715 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -272,9 +272,6 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p) initFromParams(p); - // chrome floaters don't take focus at all - setFocusRoot(!getIsChrome()); - initFloater(p); } @@ -2910,8 +2907,6 @@ 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); diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 85d0c633af..2e5ebafe46 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -21,4 +21,5 @@ tear_off_pressed_image="tearoff_pressed.tga" dock_pressed_image="Icon_Dock_Press" help_pressed_image="Icon_Help_Press" + focus_root="true" /> |