diff options
author | Merov Linden <merov@lindenlab.com> | 2010-11-24 00:49:33 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-11-24 00:49:33 -0800 |
commit | 744d23e3145eeca2c8db34b39cd1dc4bec24d3b1 (patch) | |
tree | 5d38f05222333ebb019b8d3fe3c6d287b69e13a9 /indra/newview/llagent.cpp | |
parent | 44a6e5da2c76b16bb70a93ba9952bc338dce2e89 (diff) | |
parent | 2e47e4f303b9b4d9222cbf6310e0a887468e3109 (diff) |
Merge from lindenlab/viewer-beta
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r-- | indra/newview/llagent.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 3a45c79ec3..001a6a8851 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -56,7 +56,6 @@ #include "llparcel.h" #include "llrendersphere.h" #include "llsdutil.h" -#include "llsidetray.h" #include "llsky.h" #include "llsmoothstep.h" #include "llstartup.h" @@ -1727,9 +1726,6 @@ void LLAgent::endAnimationUpdateUI() LLBottomTray::getInstance()->onMouselookModeOut(); - LLSideTray::getInstance()->getButtonsPanel()->setVisible(TRUE); - LLSideTray::getInstance()->updateSidetrayVisibility(); - LLPanelStandStopFlying::getInstance()->setVisible(TRUE); LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset); @@ -1829,9 +1825,6 @@ void LLAgent::endAnimationUpdateUI() LLBottomTray::getInstance()->onMouselookModeIn(); - LLSideTray::getInstance()->getButtonsPanel()->setVisible(FALSE); - LLSideTray::getInstance()->updateSidetrayVisibility(); - LLPanelStandStopFlying::getInstance()->setVisible(FALSE); // clear out camera lag effect |