diff --git a/indra/newview/hbprefsinert.cpp b/indra/newview/hbprefsinert.cpp
index da5daed7b..428478652 100644
--- a/indra/newview/hbprefsinert.cpp
+++ b/indra/newview/hbprefsinert.cpp
@@ -38,6 +38,7 @@
 #include "llviewercontrol.h"
 #include "lluictrlfactory.h"
 #include "llcombobox.h"
+#include "llwind.h"
 
 class LLPrefsInertImpl : public LLPanel
 {
@@ -63,6 +64,7 @@ private:
 	BOOL mPreviewAnimInWorld;
 	BOOL mSpeedRez;
 	BOOL mRevokePermsOnStandUp;
+	BOOL mEnableLLWind;
 	U32 mSpeedRezInterval;
 	U32 mLinksForChattingObjects;
 	U32 mTimeFormat;
@@ -111,6 +113,7 @@ void LLPrefsInertImpl::refreshValues()
 	mSpeedRezInterval			= gSavedSettings.getU32("SpeedRezInterval");
 	mLinksForChattingObjects	= gSavedSettings.getU32("LinksForChattingObjects");
 	mRevokePermsOnStandUp		= gSavedSettings.getBOOL("RevokePermsOnStandUp");
+	mEnableLLWind				= gSavedSettings.getBOOL("WindEnabled");
 }
 
 void LLPrefsInertImpl::refresh()
@@ -183,6 +186,8 @@ void LLPrefsInertImpl::cancel()
 	gSavedSettings.setU32("SpeedRezInterval",			mSpeedRezInterval);
 	gSavedSettings.setU32("LinksForChattingObjects",	mLinksForChattingObjects);
 	gSavedSettings.setBOOL("RevokePermsOnStandUp",		mRevokePermsOnStandUp);
+	gSavedSettings.setBOOL("WindEnabled",				mEnableLLWind);
+	gLLWindEnabled = mEnableLLWind;
 }
 
 void LLPrefsInertImpl::apply()
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
index 6a311094b..f407eaaac 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
@@ -83,6 +83,14 @@
 				</radio_item>
 			</radio_group>
 		</panel>
+		<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
+			 follows="left|top|right|bottom" label="Performance" name="Performance">
+			 <check_box bottom_delta="-20" control_name="WindEnabled" enabled="true"
+			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+		    	label="Enable Wind Effects" left="10"
+			    mouse_opaque="true" name="enable_wind" radio_style="false"
+		    	width="400" />
+		</panel>
     	<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
 			 follows="left|top|right|bottom" label="Miscellaneous" name="Miscellaneous">
 			<check_box bottom_delta="-30" control_name="DoubleClickTeleport" enabled="true"