summaryrefslogtreecommitdiff
path: root/indra/llui/llpanel.cpp
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-12-09 16:48:07 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-12-09 16:48:07 -0800
commit95445fb1b56a60145933db0891133230c87274b8 (patch)
treef9b03971e89800c68b4c4430b13c90af6cba51e7 /indra/llui/llpanel.cpp
parent089665ce4eab97d0ab58e08914f852219ed3fae7 (diff)
parentcf6147f7c092e6ca10697dea341099c5e281df00 (diff)
Merge with viewer-development.
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