diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1c6979c18..b40d6a7e7 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -709,7 +709,7 @@
       <string>http://www.secondlife.com</string>
     </map>
     <key>BlockAvatarAppearanceMessages</key>
-        <map>
+    <map>
         <key>Comment</key>
             <string>Ignore's appearance messages (for simulating Ruth)</string>
         <key>Persist</key>
@@ -718,7 +718,18 @@
             <string>Boolean</string>
         <key>Value</key>
             <integer>0</integer>
-        </map>
+    </map>
+    <key>BroadcastViewerEffects</key>
+    <map>
+      <key>Comment</key>
+      <string>Broadcast Viewer Effects</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>BrowserProxyAddress</key>
     <map>
       <key>Comment</key>
@@ -4241,17 +4252,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>RadarChatKeysChannel</key>
-    <map>
-      <key>Comment</key>
-      <string>Private channel used to broadcast the key of incoming avatars</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <integer>-8888888</integer>
-    </map>
     <key>FloaterLandRect5</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/hbprefsinert.cpp b/indra/newview/hbprefsinert.cpp
index 9316ee529..cda9a5031 100644
--- a/indra/newview/hbprefsinert.cpp
+++ b/indra/newview/hbprefsinert.cpp
@@ -68,6 +68,7 @@ private:
 	BOOL mEnableLLWind;
 	BOOL mEnableClouds;
 	BOOL mInitialEnableClouds;
+	BOOL mBroadcastViewerEffects;
 	U32 mSpeedRezInterval;
 	U32 mLinksForChattingObjects;
 	U32 mTimeFormat;
@@ -120,6 +121,7 @@ void LLPrefsInertImpl::refreshValues()
 	mRevokePermsOnStandUp		= gSavedSettings.getBOOL("RevokePermsOnStandUp");
 	mEnableLLWind				= gSavedSettings.getBOOL("WindEnabled");
 	mEnableClouds				= gSavedSettings.getBOOL("CloudsEnabled");
+	mBroadcastViewerEffects		= gSavedSettings.getBOOL("BroadcastViewerEffects");
 }
 
 void LLPrefsInertImpl::refresh()
@@ -193,6 +195,8 @@ void LLPrefsInertImpl::cancel()
 	gSavedSettings.setU32("LinksForChattingObjects",	mLinksForChattingObjects);
 	gSavedSettings.setBOOL("RevokePermsOnStandUp",		mRevokePermsOnStandUp);
 	gSavedSettings.setBOOL("WindEnabled",				mEnableLLWind);
+	gSavedSettings.setBOOL("BroadcastViewerEffects",	mBroadcastViewerEffects);
+	
 	gLLWindEnabled = mEnableLLWind;
 	
 	if(mInitialEnableClouds != gSavedSettings.getBOOL("CloudsEnabled"))
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 a245a8b54..0443b07db 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
@@ -125,6 +125,11 @@
 	    		label="Preview animations on the avatar instead on a dummy before uploading" left="10"
 			    mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
 			    width="400" />
+			<check_box bottom_delta="-20" control_name="BroadcastViewerEffects" enabled="true"
+			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+		    	label="Broadcast Viewer Effects" left="10"
+			    mouse_opaque="true" name="broadcast_viewer_effects" radio_style="false"
+		    	width="400" />
 			<check_box bottom_delta="-20" control_name="PrivateLookAt" enabled="true"
 			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	    		label="Do not look at or point to objects (defeats ShowLookAt)" left="10"
@@ -136,7 +141,7 @@
 				mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
 				width="400" />
 			<check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="true"
-			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
 	    		label="Save scripts in inventory as Mono scripts instead of LSL2" left="10"
 		    	mouse_opaque="true" name="save_scripts_as_mono_check" radio_style="false"
 			    width="400" />