diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-11 11:51:59 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-11 11:51:59 -0700 |
| commit | a21b7b330b65eebff050eb6c036745cac1578232 (patch) | |
| tree | f1d39777dc34fe5807f5b4a8bfdb4aadcb79ea62 /indra/llaudio/llaudioengine_openal.cpp | |
| parent | 8ea4802251cbfb4fcf112f597f4a4ff1ab0d3f1f (diff) | |
| parent | 571c2bc5e5190cae7324dd235f9c44db9823327a (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/llaudio/llaudioengine_openal.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine_openal.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp index a5982ccbd6..887c791790 100644 --- a/indra/llaudio/llaudioengine_openal.cpp +++ b/indra/llaudio/llaudioengine_openal.cpp @@ -370,7 +370,7 @@ U32 LLAudioBufferOpenAL::getLength() // ------------ -void LLAudioEngine_OpenAL::initWind() +bool LLAudioEngine_OpenAL::initWind() { ALenum error; llinfos << "LLAudioEngine_OpenAL::initWind() start" << llendl; @@ -397,10 +397,12 @@ void LLAudioEngine_OpenAL::initWind() if(mWindBuf==NULL) { llerrs << "LLAudioEngine_OpenAL::initWind() Error creating wind memory buffer" << llendl; - mEnableWind=false; + return false; } llinfos << "LLAudioEngine_OpenAL::initWind() done" << llendl; + + return true; } void LLAudioEngine_OpenAL::cleanupWind() @@ -508,14 +510,14 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude) alGenBuffers(1,&buffer); if((error=alGetError()) != AL_NO_ERROR) { - llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind buffer: " << error << llendl; + llwarns << "LLAudioEngine_OpenAL::updateWind() Error creating wind buffer: " << error << llendl; break; } alBufferData(buffer, AL_FORMAT_STEREO16, mWindGen->windGenerate(mWindBuf, - mWindBufSamples, 2), + mWindBufSamples), mWindBufBytes, mWindBufFreq); error = alGetError(); |