1 files changed, 5 insertions, 8 deletions

diff --git a/linden/indra/llaudio/windgen.h b/linden/indra/llaudio/windgen.h
index 39ce568..faffd3c 100644
--- a/linden/indra/llaudio/windgen.h
+++ b/linden/indra/llaudio/windgen.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -82,7 +82,7 @@ public:
                         // start with white noise
                         nextSample = ll_frand(2.0f) - 1.0f;
                         
-#if 1 // LLAE_WIND_PINK apply pinking filter
+                        // apply pinking filter
                         mbuf0 = 0.997f * mbuf0 + 0.0126502f * nextSample; 
                         mbuf1 = 0.985f * mbuf1 + 0.0139083f * nextSample;
                         mbuf2 = 0.950f * mbuf2 + 0.0205439f * nextSample;
@@ -91,14 +91,11 @@ public:
                         mbuf5 = 0.250f * mbuf5 + 0.1093477f * nextSample;
                         
                         nextSample = mbuf0 + mbuf1 + mbuf2 + mbuf3 + mbuf4 + mbuf5;
-#endif
                         
-#if 1 //LLAE_WIND_RESONANT // do a resonant filter on the noise
+                        // do a resonant filter on the noise
                         nextSample = (double)( a0 * nextSample - b1 * mY0 - b2 * mY1 );
-                        
                         mY1 = mY0;
                         mY0 = nextSample;
-#endif
                         
                         nextSample *= mCurrentGain;