diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-13 10:08:55 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-13 10:08:55 -0500 |
commit | 618249155ae333c64c693a0f7f38453f3c871787 (patch) | |
tree | db28a3725a4e099735d4ce457ecf90267f8401da /indra/llui/llpanel.cpp | |
parent | 6f8ff871cdd0402d07800444f0524079fe02fac6 (diff) | |
parent | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llui/llpanel.cpp')
-rw-r--r-- | indra/llui/llpanel.cpp | 2 |
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 |