summaryrefslogtreecommitdiff
path: root/indra/newview/llvieweraudio.cpp
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2012-05-30 17:07:17 -0400
committerJonathan Yap <none@none>2012-05-30 17:07:17 -0400
commit29737cb9c00cc46059e3a77bce06d45e45fe4d9f (patch)
treecdde3b9cc88fa1d1a9ba8a51e01914de16b18461 /indra/newview/llvieweraudio.cpp
parentb2434b2f5e6909d62a6bd0b942d554dcba3cd052 (diff)
STORM-1812 First pass at adding teleport started signal
Diffstat (limited to 'indra/newview/llvieweraudio.cpp')
-rw-r--r--indra/newview/llvieweraudio.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
index 2ef159ff31..7ac0d3aeaa 100644
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@@ -41,6 +41,7 @@
#include "llstartup.h"
#include "llviewerparcelmgr.h"
#include "llparcel.h"
+#include "llviewermessage.h"
/////////////////////////////////////////////////////////
@@ -56,6 +57,8 @@ LLViewerAudio::LLViewerAudio() :
setTeleportFailedCallback(boost::bind(&LLViewerAudio::onTeleportFailed, this));
mTeleportFinishedConnection = LLViewerParcelMgr::getInstance()->
setTeleportFinishedCallback(boost::bind(&LLViewerAudio::onTeleportFinished, this, _1, _2));
+ mTeleportStartedConnection = LLViewerMessage::getInstance()->
+ setTeleportStartedCallback(boost::bind(&LLViewerAudio::onTeleportStarted, this));
}
LLViewerAudio::~LLViewerAudio()
@@ -249,6 +252,11 @@ F32 LLViewerAudio::getFadeVolume()
return fade_volume;
}
+void LLViewerAudio::onTeleportStarted()
+{
+llwarns << "DBG teleport started" << llendl;
+}
+
void LLViewerAudio::onTeleportFailed()
{
// Calling audio_update_volume makes sure that the music stream is properly set to be restored to