Second Life viewer sources 1.21.0-RC

1 files changed, 2 insertions, 20 deletions

diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index d430d17..d0aad25 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -87,7 +87,7 @@ void* LLOverlayBar::createMediaRemote(void* userdata)
 void* LLOverlayBar::createVoiceRemote(void* userdata)
 {
         LLOverlayBar *self = (LLOverlayBar*)userdata;   
-        self->mVoiceRemote = new LLVoiceRemoteCtrl("voice_remote");
+        self->mVoiceRemote = new LLVoiceRemoteCtrl(std::string("voice_remote"));
         return self->mVoiceRemote;
 }
 
@@ -120,7 +120,6 @@ BOOL LLOverlayBar::postBuild()
 {
         childSetAction("IM Received",onClickIMReceived,this);
         childSetAction("Set Not Busy",onClickSetNotBusy,this);
-        childSetAction("Release Keys",onClickReleaseKeys,this);
         childSetAction("Mouselook",onClickMouselook,this);
         childSetAction("Stand Up",onClickStandUp,this);
         childSetVisible("chat_bar", gSavedSettings.getBOOL("ChatVisible"));
@@ -210,17 +209,6 @@ void LLOverlayBar::refresh()
                 buttons_changed = TRUE;
         }
 
-        BOOL controls_grabbed = gAgent.anyControlGrabbed();
-        button = getChild<LLButton>("Release Keys");
-
-        if (button && button->getVisible() != controls_grabbed)
-        {
-                button->setVisible(controls_grabbed);
-                sendChildToFront(button);
-                moveChildToBackOfTabGroup(button);
-                buttons_changed = TRUE;
-        }
-
         BOOL mouselook_grabbed;
         mouselook_grabbed = gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_DOWN_INDEX)
                 || gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX);
@@ -296,12 +284,6 @@ void LLOverlayBar::onClickSetNotBusy(void*)
 
 
 // static
-void LLOverlayBar::onClickReleaseKeys(void*)
-{
-        gAgent.forceReleaseControls();
-}
-
-// static
 void LLOverlayBar::onClickResetView(void* data)
 {
         handle_reset_view();
@@ -379,7 +361,7 @@ void LLOverlayBar::toggleMusicPlay(void*)
                                 // stream is stopped, it doesn't return the right thing - commenting out for now.
         //                      if ( gAudiop->isInternetStreamPlaying() == 0 )
                                 {
-                                        gAudiop->startInternetStream(parcel->getMusicURL().c_str());
+                                        gAudiop->startInternetStream(parcel->getMusicURL());
                                 }
                         }
                 }