summaryrefslogtreecommitdiff
path: root/indra/llui/llpanel.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-04 16:43:26 -0500
committerOz Linden <oz@lindenlab.com>2011-01-04 16:43:26 -0500
commit05810f063dbe0ed87d03ea41c7d8fdc423945c6e (patch)
tree311355a1679ef47fa1951788319e0c521a188edd /indra/llui/llpanel.cpp
parent5e376017858f6534163b0bfb6b385bdd0aeac5d3 (diff)
parente4591a85182133811e327b579c558bb3db80d79e (diff)
merge changes for storm-737
Diffstat (limited to 'indra/llui/llpanel.cpp')
-rw-r--r--indra/llui/llpanel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index ff377ba3a1..b2383106a8 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -436,7 +436,7 @@ void LLPanel::initFromParams(const LLPanel::Params& p)
//and LLView::initFromParams will use them to set visible and enabled
setVisible(p.visible);
setEnabled(p.enabled);
-
+ setFocusRoot(p.focus_root);
setSoundFlags(p.sound_flags);
// control_name, tab_stop, focus_lost_callback, initial_value, rect, enabled, visible