aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-09-07 14:13:17 -0700
committerArmin Weatherwax2010-09-23 15:38:27 +0200
commitac551638773309e865e384d74aff6473c5690ca7 (patch)
tree5deb95b1f13eb377385e7478f150e0bb0e1628f5 /linden/indra
parentFixed newview\CMakeLists.txt not parsing on Windows (diff)
downloadmeta-impy-ac551638773309e865e384d74aff6473c5690ca7.zip
meta-impy-ac551638773309e865e384d74aff6473c5690ca7.tar.gz
meta-impy-ac551638773309e865e384d74aff6473c5690ca7.tar.bz2
meta-impy-ac551638773309e865e384d74aff6473c5690ca7.tar.xz
Fixed Windows compile error with WIND_BUFFER_SIZE_SEC
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/llaudio/llaudioengine_openal.cpp2
-rw-r--r--linden/indra/llaudio/llaudioengine_openal.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llaudio/llaudioengine_openal.cpp b/linden/indra/llaudio/llaudioengine_openal.cpp
index 99ab18e..93bc42b 100644
--- a/linden/indra/llaudio/llaudioengine_openal.cpp
+++ b/linden/indra/llaudio/llaudioengine_openal.cpp
@@ -38,6 +38,8 @@
38#include "lllistener_openal.h" 38#include "lllistener_openal.h"
39 39
40 40
41static const float WIND_BUFFER_SIZE_SEC = 0.05f; // 1/20th sec
42
41LLAudioEngine_OpenAL::LLAudioEngine_OpenAL() 43LLAudioEngine_OpenAL::LLAudioEngine_OpenAL()
42 : 44 :
43 mWindGen(NULL), 45 mWindGen(NULL),
diff --git a/linden/indra/llaudio/llaudioengine_openal.h b/linden/indra/llaudio/llaudioengine_openal.h
index 5aca03e..900bcb3 100644
--- a/linden/indra/llaudio/llaudioengine_openal.h
+++ b/linden/indra/llaudio/llaudioengine_openal.h
@@ -73,7 +73,6 @@ class LLAudioEngine_OpenAL : public LLAudioEngine
73 int mNumEmptyWindALBuffers; 73 int mNumEmptyWindALBuffers;
74 74
75 static const int MAX_NUM_WIND_BUFFERS = 80; 75 static const int MAX_NUM_WIND_BUFFERS = 80;
76 static const float WIND_BUFFER_SIZE_SEC = 0.05f; // 1/20th sec
77}; 76};
78 77
79class LLAudioChannelOpenAL : public LLAudioChannel 78class LLAudioChannelOpenAL : public LLAudioChannel