diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-21 14:43:31 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-21 14:43:31 +0200 |
| commit | 6e74f825be5f03ddf958d0e0ace2998c90fcf65e (patch) | |
| tree | ff4e278dd6019e606456a169fc8b19d12165a6d3 /indra/newview | |
| parent | 267b7ad011f366f84509a7388d66798a5c7b380b (diff) | |
| parent | 6cbcf63cb36d3e87dc3d160fd6d31a1fc25e6100 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -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 { |