From 5ca6654804dd26f41320b461dbe81d1dba42c3f4 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 14 Feb 2009 23:16:16 -0700
Subject: Fixed music button not toggling on first run

---
 ChangeLog.txt                              | 7 +++++++
 linden/indra/newview/lloverlaybar.cpp      | 7 +++++++
 linden/indra/newview/lloverlaybar.h        | 3 +++
 linden/indra/newview/llviewerparcelmgr.cpp | 2 ++
 4 files changed, 19 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2932ab4..4348a3e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -13,6 +13,13 @@
 	* linden/indra/newview/skins/default/xui/en-us/alerts.xml:
 	Ditto.
 
+	* linden/indra/newview/lloverlaybar.cpp:
+	Fixed music button not toggling on first run.
+	* linden/indra/newview/lloverlaybar.h:
+	Ditto.
+	* linden/indra/newview/llviewerparcelmgr.cpp:
+	Ditto.
+
 
 2009-02-13  McCabe Maxsted  <hakushakukun@gmail.com>
 
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 1087fd8..80cac14 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -275,6 +275,7 @@ void LLOverlayBar::refresh()
 	{
 		layoutButtons();
 	}
+
 }
 
 //-----------------------------------------------------------------------
@@ -360,6 +361,12 @@ void LLOverlayBar::toggleMediaPlay(void*)
 }
 
 //static
+void LLOverlayBar::musicFirstRun()
+{
+	gOverlayBar->mMusicState = PLAYING;
+}
+
+//static
 void LLOverlayBar::toggleMusicPlay(void*)
 {
 	if (!gOverlayBar)
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 5880ff0..73d0a43 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -80,6 +80,9 @@ public:
 	static void musicStop(void*);
 	static void mediaStop(void*);
 
+	// hack to make sure the music button plays.
+	static void musicFirstRun();
+
 	static void toggleAudioVolumeFloater(void*);
 
 protected:	
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index e27e284..2dee2bf 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -1720,6 +1720,8 @@ void callback_start_music(S32 option, void* data)
 		// We fetch again to avoid lag while loading.
 		LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();		
 		gAudiop->startInternetStream(parcel->getMusicURL());
+
+		LLOverlayBar::musicFirstRun();
 	}
 	gSavedSettings.setWarning("FirstStreamingMusic", FALSE);
 }
-- 
cgit v1.1