Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

1 files changed, 0 insertions, 6 deletions

diff --git a/linden/indra/llaudio/audioengine_openal.h b/linden/indra/llaudio/audioengine_openal.h
index 70de9d4..5ccdcb7 100644
--- a/linden/indra/llaudio/audioengine_openal.h
+++ b/linden/indra/llaudio/audioengine_openal.h
@@ -39,10 +39,6 @@
 #include "listener_openal.h"
 #include "windgen.h"
 
-#if 1
-#define WIND_BUFFER_SIZE_SEC 0.05f
-#endif
-
 
 class LLAudioEngine_OpenAL : public LLAudioEngine
 {
@@ -77,9 +73,7 @@ class LLAudioEngine_OpenAL : public LLAudioEngine
                 int mNumEmptyWindALBuffers;
 
                 static const int MAX_NUM_WIND_BUFFERS = 80;
-#if 0
                 static const float WIND_BUFFER_SIZE_SEC = 0.05f; // 1/20th sec
-#endif
 };
 
 class LLAudioChannelOpenAL : public LLAudioChannel