From 5ec8bbbe2244ea70d8aa74b5c572351632699425 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Wed, 10 Oct 2007 00:01:43 +0000
Subject: svn merge -r71238:71367
 svn+ssh://svn/svn/linden/branches/maint-ui-qa3

---
 indra/newview/lloverlaybar.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview/lloverlaybar.cpp')

diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp
index c941ce3bb5..d8131c27d7 100644
--- a/indra/newview/lloverlaybar.cpp
+++ b/indra/newview/lloverlaybar.cpp
@@ -360,8 +360,7 @@ void LLOverlayBar::refresh()
 	{
 		LLParcel* parcel = gParcelMgr->getAgentParcel();
 		if (!parcel 
-			|| !parcel->getMusicURL()
-			|| !parcel->getMusicURL()[0]
+			|| parcel->getMusicURL().empty()
 			|| !gSavedSettings.getBOOL("AudioStreamingMusic"))
 		{
 			mMusicRemote->setVisible(FALSE);
@@ -509,7 +508,7 @@ void LLOverlayBar::musicPlay(void*)
 			// stream is stopped, it doesn't return the right thing - commenting out for now.
 // 			if ( gAudiop->isInternetStreamPlaying() == 0 )
 			{
-				gAudiop->startInternetStream(parcel->getMusicURL());
+				gAudiop->startInternetStream(parcel->getMusicURL().c_str());
 			}
 		}
 	}
-- 
cgit v1.2.3