diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-21 15:58:35 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-21 15:58:35 -0500 |
| commit | aa68e0fd302bd91b7387bafa1ba19412ec98af4e (patch) | |
| tree | edc4a9a81111195ec275cf6d008427f6099e907e /indra/newview/llbottomtray.cpp | |
| parent | ccc90257e7622bcf35454e8d4a0780f020ee6c39 (diff) | |
| parent | 24c8ed10470b1fe6cc58ba5b2e07a34a183cb1c6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 988867ef84..bd68d52868 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -322,7 +322,7 @@ void LLBottomTray::setVisible(BOOL visible) // Chat bar and gesture button are shown even in mouselook mode. // But the move, camera and snapshot buttons shouldn't be displayed. See EXT-3988. - if ("chat_bar" == name || "gesture_panel" == name) + if ("chat_bar" == name || "gesture_panel" == name || (visibility && ("movement_panel" == name || "cam_panel" == name || "snapshot_panel" == name))) continue; else { |