From 1b6c1d85d0486c0f06359b0d89b1938c2970abe8 Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Wed, 18 Aug 2010 03:16:06 +0000
Subject: [PATCH] an IP spoofing protection of level 2 or higher may bluescreen
 windows. Change the default and make note of this.

---
 indra/newview/app_settings/settings.xml       | 24 +------------------
 .../xui/en-us/panel_preferences_inert.xml     |  2 +-
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f3db0a4b5..3219f4d1e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -808,28 +808,6 @@
       <string>S32</string>
       <key>Value</key>
       <integer>5</integer>
-    </map>
-	<key>SpoofProtectionAlerts</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables IP Spoofing protection alerts</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-	<key>SpoofProtectionLevel</key>
-    <map>
-      <key>Comment</key>
-      <string>IP Spoofing protection level</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>U32</string>
-      <key>Value</key>
-      <integer>0</integer>
     </map>
 	<key>Socks5ProxyEnabled</key>
     <map>
@@ -8622,7 +8600,7 @@
 		<key>Type</key>
 		<string>U32</string>
 		<key>Value</key>
-		<integer>255</integer>
+		<integer>1</integer>
 	</map>
 	<key>SpoofProtectionAlerts</key>
 	<map>
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 135b7d892..2fd3c7be1 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
@@ -102,7 +102,7 @@
 			     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 			     mouse_opaque="false" name="text_box" v_pad="0" width="500">
-				IP Spoofing Protection (0 being off, 3 being highest)
+				IP Spoofing Protection (0 being off, 3 being highest, anything higher than 1 may BlueScreen Windows)
 			</text>
 			 <slider bottom_delta="-25" can_edit_text="false"
 			     decimal_digits="0" enabled="true" follows="left|top" height="15"