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/newview/llsidetray.cpp | |
parent | 6f8ff871cdd0402d07800444f0524079fe02fac6 (diff) | |
parent | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llsidetray.cpp')
-rw-r--r-- | indra/newview/llsidetray.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 9c8557c017..3bc3959e0b 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -159,8 +159,6 @@ LLSideTrayTab::LLSideTrayTab(const Params& p) mDescription(p.description), mMainPanel(NULL) { - // Necessary for focus movement among child controls - setFocusRoot(TRUE); } LLSideTrayTab::~LLSideTrayTab() @@ -917,7 +915,6 @@ void LLSideTray::createButtons () } } LLHints::registerHintTarget("inventory_btn", mTabButtons["sidebar_inventory"]->getHandle()); - LLHints::registerHintTarget("dest_guide_btn", mTabButtons["sidebar_places"]->getHandle()); } void LLSideTray::processTriState () |