summaryrefslogtreecommitdiff
path: root/indra/newview/llsidetray.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-11-24 10:28:41 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-11-24 10:28:41 -0800
commit82f3a34e17f82d894e6506d1451002a3b563fd8d (patch)
treedb422827f81f1c2215199cd764d18a9c8e71eb82 /indra/newview/llsidetray.cpp
parentd18e4c68843d524e871ffb24427a9df52dce1243 (diff)
parentd7d23d16246e182c1cc74a57cac357aaa5c6c8e2 (diff)
Merge
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.