diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-02-16 23:36:54 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-02-16 23:36:54 -0500 |
| commit | e3a71c74e24cc052bab14544730bcd9bcef35ca8 (patch) | |
| tree | 109f6c98feea64f01330960407634eee9196356b /indra/llaudio/llaudioengine.cpp | |
| parent | 69032d8d9d660de5b3c97589b7cc55dac70b153c (diff) | |
| parent | 6552874c82ed5ed09cf0a4d16351cdd5c8698755 (diff) | |
automated merge from 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 } |