diff options
Diffstat (limited to 'indra/newview/lloverlaybar.cpp')
-rw-r--r-- | indra/newview/lloverlaybar.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp index e7c313638b..15195d8f02 100644 --- a/indra/newview/lloverlaybar.cpp +++ b/indra/newview/lloverlaybar.cpp @@ -193,15 +193,6 @@ void LLOverlayBar::layoutButtons() } } -void LLOverlayBar::draw() -{ - childSetVisible("chat_bar", gSavedSettings.getBOOL("ChatVisible")); - - // draw children on top - LLPanel::draw(); -} - - // Per-frame updates of visibility void LLOverlayBar::refresh() { @@ -266,8 +257,6 @@ void LLOverlayBar::refresh() buttons_changed = TRUE; } - // update "remotes" - childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled()); enableMediaButtons(); moveChildToBackOfTabGroup(mMediaRemote); @@ -276,13 +265,21 @@ void LLOverlayBar::refresh() // turn off the whole bar in mouselook if (gAgent.cameraMouselook()) { - setVisible(FALSE); + childSetVisible("media_remote_container", FALSE); + childSetVisible("voice_remote_container", FALSE); + childSetVisible("state_buttons", FALSE); } else { - setVisible(TRUE); + // update "remotes" + childSetVisible("media_remote_container", TRUE); + childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled()); + childSetVisible("state_buttons", TRUE); } + // always let user toggle into and out of chatbar + childSetVisible("chat_bar", gSavedSettings.getBOOL("ChatVisible")); + if (buttons_changed) { layoutButtons(); |