summaryrefslogtreecommitdiff
path: root/indra/llui/llpanel.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2010-12-17 15:54:00 -0500
committerMonty Brandenberg <monty@lindenlab.com>2010-12-17 15:54:00 -0500
commitdb11a76d519ebb076ec0b72284993d7f6c15f383 (patch)
tree2fa7986e0e0ba9a39b2d2d3722ce1769ce6c2684 /indra/llui/llpanel.cpp
parent3c05ebd28635e867f9726062b08cdbf4a7b53b22 (diff)
parentfb8ba15801f0620699fecdf2ed08668df0be7210 (diff)
Merge from viewer-development post 2.4 release
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