summaryrefslogtreecommitdiff
path: root/indra/newview/llvieweraudio.cpp
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2012-05-14 13:20:06 -0400
committerJonathan Yap <none@none>2012-05-14 13:20:06 -0400
commit502e89971f8cf22c49e9c42c38f0aee54a0654c5 (patch)
tree88c76e6ae091e436c7746289942177b3437b3ed7 /indra/newview/llvieweraudio.cpp
parent1daac7272246416473942d05f1f700eb911ae942 (diff)
STORM-1812 Tweak how music is restarted for teleport within a parcel
Diffstat (limited to 'indra/newview/llvieweraudio.cpp')
-rw-r--r--indra/newview/llvieweraudio.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
index 0114c292dc..c04e6eeb5c 100644
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@@ -268,7 +268,7 @@ void LLViewerAudio::onTeleportFinished(const LLVector3d& pos, const bool& local)
LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if (parcel)
{
- LLViewerParcelMgr::optionally_start_music(parcel->getMusicURL());
+ mNextStreamURI = parcel->getMusicURL();
}
}
}