diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-21 09:25:44 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-21 09:25:44 -0800 |
| commit | 2c0418dfe0a3e903210516a70fd947870c340bf8 (patch) | |
| tree | 9fc4c80cda74d89038f433e4e4c7f331ed702e84 /indra/newview/llbottomtray.cpp | |
| parent | 435dcdb3e307f70b5d0be801a98fb05cb1c87fcf (diff) | |
| parent | 43c355e39891db7047652d56fd5bf53bb69659b7 (diff) | |
PE 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 { |