summaryrefslogtreecommitdiff
path: root/indra/newview/llsidetray.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/newview/llsidetray.cpp
parent089665ce4eab97d0ab58e08914f852219ed3fae7 (diff)
parentcf6147f7c092e6ca10697dea341099c5e281df00 (diff)
Merge with viewer-development.
Diffstat (limited to 'indra/newview/llsidetray.cpp')
-rw-r--r--indra/newview/llsidetray.cpp3
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 ()