summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorCG Linden <cg@lindenlab.com>2010-01-29 16:29:12 -0800
committerCG Linden <cg@lindenlab.com>2010-01-29 16:29:12 -0800
commitf6a59081a7959e21f952a93bc3809315f2fa361e (patch)
treed77373c86810e505892cfb483001fe535201db46 /indra/newview/llagent.cpp
parentb8856efd5ff0e4899bb369dfd0815e824cd3a432 (diff)
parent682f8afcc073b62fed64a3fd2adc5f65793e1f3e (diff)
Merge in latest viewer-2-0 changes.
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r--indra/newview/llagent.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index da0e9238d6..2354323a66 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -2805,7 +2805,6 @@ void LLAgent::endAnimationUpdateUI()
LLNavigationBar::getInstance()->setVisible(TRUE);
gStatusBar->setVisibleForMouselook(true);
- LLBottomTray::getInstance()->setVisible(TRUE);
LLBottomTray::getInstance()->onMouselookModeOut();
LLSideTray::getInstance()->getButtonsPanel()->setVisible(TRUE);
@@ -2906,7 +2905,6 @@ void LLAgent::endAnimationUpdateUI()
gStatusBar->setVisibleForMouselook(false);
LLBottomTray::getInstance()->onMouselookModeIn();
- LLBottomTray::getInstance()->setVisible(FALSE);
LLSideTray::getInstance()->getButtonsPanel()->setVisible(FALSE);
LLSideTray::getInstance()->updateSidetrayVisibility();