summaryrefslogtreecommitdiff
path: root/indra/newview/lloverlaybar.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-02-01 22:10:40 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-02-01 22:10:40 +0000
commit485c7ee0e2ebc2223c35fbb59a569ed889a1193c (patch)
tree35f827e55eecf91dab0a1c701a5645c0edf3335f /indra/newview/lloverlaybar.cpp
parentb302f15deea0f4f7f5de75bfd3776c17021b6444 (diff)
merge Branch_1-19-0-Viewer -r 78432:78989 -> release
QA'd in QAR-186: DEV-9179: Commit translated and reviewed strings from 1.19 frozen branch pull DEV-8792 Place information teleport button hidden behind chat bar. DEV-9374: Remove "New Account..." and "Preferences" buttons from login screen for 1.19.0 DEV-9411 -- Update required version of Quicktime library to 7.4 for 1.19.0 Viewer DEV-9430 Viewer auth failed login screen is shown in the loginxui 1.19 viewer on failure to retrieve normal login screen - changed wording of error page DEV-8537 Chat console appearing underneath status buttons DEV-9283 Chatbar cant be open while in mouselook DEV-9226 Some Dazzle? icons have sneaked into the release branch DEV-9520 Menus and Other items minimise behind onscreen buttons DEV-9521 Unable to ctrl and click to select in the friends list DEV-9530 SEC-20 Exploit to force users to teleport to a location on profile open. DEV-6833 - Mature events icon and checkbox is missing from map legend Also: Added vc9 project files (+ minor changes for vc9) (steve) Modified vc project files to not include the path for flex / bison (steve) Added marker file deletion to crash logger to stop double reporting. (cube)
Diffstat (limited to 'indra/newview/lloverlaybar.cpp')
-rw-r--r--indra/newview/lloverlaybar.cpp23
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();