From 278d3b15e6f7ecd83e48bb5c7eac11f670776a72 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sun, 20 May 2012 14:22:38 -0400
Subject: [PATCH] STORM-1812 Store playing state from an additional place.
---
indra/newview/llvieweraudio.cpp | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
index 9953bc1f363..542f16cbeec 100644
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@@ -382,15 +382,9 @@ void audio_update_volume(bool force_update)
if (progress_view_visible && !LLViewerAudio::getInstance()->getForcedTeleportFade())
{
// Even though the music was turned off it was starting up (with autoplay disabled) occasionally
- // after a failed teleport or after an intra-parcel teleport.
- if (gAudiop->getInternetStreamURL().empty())
- {
- LLViewerAudio::getInstance()->setWasPlaying(false);
- }
- else
- {
- LLViewerAudio::getInstance()->setWasPlaying(true);
- }
+ // after a failed teleport or after an intra-parcel teleport. Also, the music sometimes was not
+ // restarting after a successful intra-parcel teleport. Setting mWasPlaying fixes these issues.
+ LLViewerAudio::getInstance()->setWasPlaying(!gAudiop->getInternetStreamURL().empty());
LLViewerAudio::getInstance()->setForcedTeleportFade(true);
LLViewerAudio::getInstance()->startInternetStreamWithAutoFade(LLStringUtil::null);
LLViewerAudio::getInstance()->setNextStreamURI(LLStringUtil::null);
@@ -398,6 +392,7 @@ void audio_update_volume(bool force_update)
if (!progress_view_visible && LLViewerAudio::getInstance()->getForcedTeleportFade())
{
+ LLViewerAudio::getInstance()->setWasPlaying(!gAudiop->getInternetStreamURL().empty());
LLViewerAudio::getInstance()->setForcedTeleportFade(false);
}
--
GitLab