summaryrefslogtreecommitdiff
path: root/indra/newview/llsidetray.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-11-24 00:49:33 -0800
committerMerov Linden <merov@lindenlab.com>2010-11-24 00:49:33 -0800
commit744d23e3145eeca2c8db34b39cd1dc4bec24d3b1 (patch)
tree5d38f05222333ebb019b8d3fe3c6d287b69e13a9 /indra/newview/llsidetray.cpp
parent44a6e5da2c76b16bb70a93ba9952bc338dce2e89 (diff)
parent2e47e4f303b9b4d9222cbf6310e0a887468e3109 (diff)
Merge from lindenlab/viewer-beta
Diffstat (limited to 'indra/newview/llsidetray.cpp')
-rw-r--r--indra/newview/llsidetray.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 81b2fc0ae0..a4f855f279 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -1028,7 +1028,8 @@ void LLSideTray::arrange()
}
// The tab buttons should be shown only if there is at least one non-detached tab.
- mButtonsPanel->setVisible(hasTabs());
+ // Also hide them in mouse-look mode.
+ mButtonsPanel->setVisible(hasTabs() && !gAgentCamera.cameraMouselook());
}
// Detach those tabs that were detached when the viewer exited last time.