diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-16 15:43:11 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-16 15:43:11 -0800 |
| commit | 4dfed6e353ff880fcd45b4c8b402bf0f5a2f19f2 (patch) | |
| tree | 5d620ae33a3f1914acf3996c8ba59d33ff2c49e1 /indra/llaudio/llaudioengine.cpp | |
| parent | fb384e6af40f6a0149d93cdc38d598dd95067fbb (diff) | |
| parent | 0e234edcc67ecf534df15f088158ef236f6de102 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llaudio/llaudioengine.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index a28c94d00d..ed06c85e1a 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -202,12 +202,12 @@ void LLAudioEngine::updateInternetStream() } // virtual -int LLAudioEngine::isInternetStreamPlaying() +LLAudioEngine::LLAudioPlayState LLAudioEngine::isInternetStreamPlaying() { if (mStreamingAudioImpl) - return mStreamingAudioImpl->isPlaying(); + return (LLAudioEngine::LLAudioPlayState) mStreamingAudioImpl->isPlaying(); - return 0; // Stopped + return LLAudioEngine::AUDIO_STOPPED; // Stopped } |