diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-21 15:19:27 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-21 15:19:27 +0200 |
| commit | a28be8aa2dd1a1440724bd72fbabc896739719dd (patch) | |
| tree | 5d27c9e7e83423d3c14ba48802114b6e0a06a5ac /indra/newview/llbottomtray.cpp | |
| parent | 89449c3f389a20944a6161a22c3048a0cde2e7da (diff) | |
| parent | 6e74f825be5f03ddf958d0e0ace2998c90fcf65e (diff) | |
merge
--HG--
branch : product-engine
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 { |