From dfc614dd1970b7ca35f0a5fff4ad2542add68e94 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 8 Jun 2009 01:42:50 -0700
Subject: Fixed VC++ error C2864: 'LLAudioEngine_OpenAL::WIND_BUFFER_SIZE_SEC'

---
 ChangeLog.txt                               | 6 ++++++
 linden/indra/llaudio/audioengine_openal.cpp | 2 +-
 linden/indra/llaudio/audioengine_openal.h   | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2457125..404b9fd 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -9,6 +9,12 @@
 	
 		modified:   linden/indra/cmake/CopyWinLibs.cmake
 		modified:   linden/install.xml
+		
+	* Fixed VC++ error C2864: 'LLAudioEngine_OpenAL::WIND_BUFFER_SIZE_SEC' : 
+		only static const integral data members can be initialized within a class.
+		
+		modified:   linden/indra/llaudio/audioengine_openal.cpp
+		modified:   linden/indra/llaudio/audioengine_openal.h
 
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/linden/indra/llaudio/audioengine_openal.cpp b/linden/indra/llaudio/audioengine_openal.cpp
index a14b725..5f04d56 100644
--- a/linden/indra/llaudio/audioengine_openal.cpp
+++ b/linden/indra/llaudio/audioengine_openal.cpp
@@ -416,7 +416,7 @@ void LLAudioEngine_OpenAL::initWind()
 	mWindGen = new LLWindGen<WIND_SAMPLE_T>;
 
 	mWindBufFreq = mWindGen->getInputSamplingRate();
-	mWindBufSamples = llceil(mWindBufFreq * WIND_BUFFER_SIZE_SEC);
+	mWindBufSamples = llceil(mWindBufFreq * 0.05f); // 1/20th sec - WIND_BUFFER_SIZE_SEC
 	mWindBufBytes = mWindBufSamples * 2 /*stereo*/ * sizeof(WIND_SAMPLE_T);
 
 	mWindBuf = new WIND_SAMPLE_T [mWindBufSamples * 2 /*stereo*/];
diff --git a/linden/indra/llaudio/audioengine_openal.h b/linden/indra/llaudio/audioengine_openal.h
index 5ccdcb7..c14551c 100644
--- a/linden/indra/llaudio/audioengine_openal.h
+++ b/linden/indra/llaudio/audioengine_openal.h
@@ -73,7 +73,6 @@ 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
 };
 
 class LLAudioChannelOpenAL : public LLAudioChannel
-- 
cgit v1.1