diff options
| author | Alain Linden <alain@lindenlab.com> | 2011-03-01 15:34:17 -0800 |
|---|---|---|
| committer | Alain Linden <alain@lindenlab.com> | 2011-03-01 15:34:17 -0800 |
| commit | 52e107e419b5bfb17f506efc127a51e8fec855e2 (patch) | |
| tree | 828c3273365d5a90601c3e30c4c9ed1dab89f87a /indra/llaudio | |
| parent | 31d673cb512f88c0bd55dd2f81671a16df0dc0c8 (diff) | |
| parent | 88f507f9ccae33a3fa9b3706a96af5c87db804b5 (diff) | |
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/llaudio')
| -rw-r--r-- | indra/llaudio/llaudioengine_openal.cpp | 2 | ||||
| -rw-r--r-- | indra/llaudio/llaudioengine_openal.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp index e352045291..34a057dcc0 100644 --- a/indra/llaudio/llaudioengine_openal.cpp +++ b/indra/llaudio/llaudioengine_openal.cpp @@ -32,6 +32,8 @@ #include "lllistener_openal.h" +const float LLAudioEngine_OpenAL::WIND_BUFFER_SIZE_SEC = 0.05f; + LLAudioEngine_OpenAL::LLAudioEngine_OpenAL() : mWindGen(NULL), diff --git a/indra/llaudio/llaudioengine_openal.h b/indra/llaudio/llaudioengine_openal.h index 258febb1a8..6639d9dfe6 100644 --- a/indra/llaudio/llaudioengine_openal.h +++ b/indra/llaudio/llaudioengine_openal.h @@ -67,7 +67,7 @@ class LLAudioEngine_OpenAL : public LLAudioEngine int mNumEmptyWindALBuffers; static const int MAX_NUM_WIND_BUFFERS = 80; - static const float WIND_BUFFER_SIZE_SEC = 0.05f; // 1/20th sec + static const float WIND_BUFFER_SIZE_SEC; // 1/20th sec }; class LLAudioChannelOpenAL : public LLAudioChannel |