summaryrefslogtreecommitdiff
path: root/indra/llui/llpanel.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-14 14:44:23 -0500
committerOz Linden <oz@lindenlab.com>2010-12-14 14:44:23 -0500
commit3aa12e85f04f0608da5df05b2cbb01685ef62944 (patch)
tree02e78886d530c92e3eddf0f73f3eb7f8a5b641da /indra/llui/llpanel.cpp
parentbae83c7eac98229271a6baf4c961fe167c74a597 (diff)
parenta702b34394e4b38b27338eb6d68d22b498984118 (diff)
merge fix(es) for storm-378
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