diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index a15086f029..44058ef57b 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -56,6 +56,20 @@
          layout="topleft"
          help_topic="preferences_general_tab"
          name="general" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_chat.xml"
+         label="Chat"
+         layout="topleft"
+         help_topic="preferences_chat_tab"
+         name="chat" />
+        <panel
+         class="panel_preference"
+         filename="panel_preferences_colors.xml"
+         label="Colors"
+         layout="topleft"
+         help_topic="preferences_im_tab"
+         name="colors" />
         <panel
 	 	 class="panel_preference_graphics"
          filename="panel_preferences_graphics1.xml"
@@ -84,17 +98,10 @@
          layout="topleft"
          help_topic="preferences_move_tab"
          name="audio" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_chat.xml"
-         label="Chat"
-         layout="topleft"
-         help_topic="preferences_chat_tab"
-         name="chat" />
         <panel
 		 class="panel_preference"
          filename="panel_preferences_alerts.xml"
-         label="Pop-Up Alerts"
+         label="Dialog Alerts"
          layout="topleft"
          help_topic="preferences_msgs_tab"
          name="msgs" />
@@ -118,7 +125,7 @@
          label="UI Extras"
          layout="topleft"
          help_topic="preferences_advanced1_tab"
-         name="advanced1" />
+         name="starlightUI1" />
 		<panel
          class="panel_preference"
          filename="panel_preferences_skins.xml"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 56777505f1..1d4381f2bb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -98,6 +98,18 @@
              function="World.Toggle.MovementControls" />
         </menu_item_check>
         
+        <menu_item_call
+             label="Sit Down"
+             layout="topleft"
+             shortcut="alt|shift|S"
+             name="Sit Down Here">
+                <menu_item_call.on_click
+                 function="Self.SitDown"
+                 parameter="" />
+                <menu_item_call.on_enable
+                 function="Self.EnableSitDown" />
+        </menu_item_call>
+        
         <menu_item_check
          label="Camera Controls"
          name="Camera Controls">
@@ -3464,6 +3476,10 @@
              function="IsGodCustomerService" />
         </menu_item_call>
     </menu>
+    
+    
+    <!-- God Menu -->
+    
     <menu
      create_jump_keys="true"
      label="Admin"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index de6717df05..83478eba05 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -44,6 +44,7 @@
    top_pad="-14"
    width="250" />
     <check_box
+     control_name="AllowMultipleViewers"
      follows="top|left"
      height="15"
      label="Allow Multiple Viewer"
@@ -53,6 +54,7 @@
      top_pad="20"
      width="237"/>
     <check_box
+     control_name="ForceShowGrid"
      follows="top|left"
      height="15"
      label="Show Grid Selection at login"
@@ -62,6 +64,7 @@
      top_pad="5"
      width="237"/>
     <check_box
+     control_name="UseDebugMenus"
      follows="top|left"
      height="15"
      label="Show Advanced Menu"
@@ -71,6 +74,7 @@
      top_pad="5"
      width="237"/>
     <check_box
+     control_name="QAMode"
      follows="top|left"
      height="15"
      label="Show Developer Menu"
@@ -79,48 +83,7 @@
      name="show_develop_menu_check"
      top_pad="5"
      width="237"/>         
-    <check_box
-     control_name="UseChatBubbles"
-     follows="left|top"
-     height="16"
-     label="Bubble chat"
-     layout="topleft"
-     left="30"
-     top_pad="20"
-     name="bubble_text_chat"
-     width="150" />
-    <slider
-     control_name="ChatBubbleOpacity"
-     follows="left|top"
-     height="16"
-     increment="0.05"
-     initial_value="1"
-     label="Opacity"
-     layout="topleft"
-     left="80"
-     label_width="156"
-     name="bubble_chat_opacity"
-     top_pad = "10"
-     width="347" />
-    <color_swatch
-     can_apply_immediately="true"
-     color="Black"
-     control_name="BackgroundChatColor"
-     follows="left|top"
-     height="50"
-     layout="topleft"
-     left_pad="30"
-     top="190"
-     name="background"
-     tool_tip="Choose color for bubble chat"
-     width="38">
-        <color_swatch.init_callback
-		     function="Pref.getUIColor"
-		     parameter="BackgroundChatColor" />
-		    <color_swatch.commit_callback
-		     function="Pref.applyUIColor"
-		     parameter="BackgroundChatColor" />
-    </color_swatch>
+    
     <check_box
      control_name="ShowScriptErrors"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 3abec4b9ef..f5182f70d8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -56,258 +56,7 @@
          width="125" />
     </radio_group>
 
-    <text
-      follows="left|top"
-      layout="topleft"
-      left="30"
-      height="12"
-      name="font_colors" 
-      top_pad="10" 
-      width="120"
-      >
-    Font colors:
-    </text>  
-  
-    <color_swatch
-     can_apply_immediately="true"
-     follows="left|top"
-     height="47"
-     layout="topleft"
-     left="40"
-     name="user"
-     top_pad="10"
-     width="44" >
-		<color_swatch.init_callback
-		 function="Pref.getUIColor"
-		 parameter="UserChatColor" />
-		<color_swatch.commit_callback
-		 function="Pref.applyUIColor"
-		 parameter="UserChatColor" />
-	</color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="text_box1"
-     top_delta="5"
-     width="95">
-        Me
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     follows="left|top"
-     height="47"
-     layout="topleft"
-     left="190"
-     name="agent"
-     top_pad="-15"
-     width="44" >
-		<color_swatch.init_callback
-		 function="Pref.getUIColor"
-		 parameter="AgentChatColor" />
-		<color_swatch.commit_callback
-		 function="Pref.applyUIColor"
-		 parameter="AgentChatColor" />
-	</color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="text_box2"
-     top_delta="5"
-     width="95">
-        Others
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     color="LtGray"
-     follows="left|top"
-     height="47"
-     label_width="60"
-     layout="topleft"
-     left="360"
-     name="im"
-     top_pad="-15"
-     width="44">
-		<color_swatch.init_callback
-		 function="Pref.getUIColor"
-		 parameter="IMChatColor" />
-		<color_swatch.commit_callback
-		 function="Pref.applyUIColor"
-		 parameter="IMChatColor" />
-	</color_swatch>
-	<text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="text_box3"
-     top_delta="5"
-     width="95">
-        IM
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     color="LtGray"
-     follows="left|top"
-     height="47"
-     label_width="44"
-     layout="topleft"
-     left="40"
-     name="system"
-     top_pad="22"
-     width="44" >
-		<color_swatch.init_callback
-		 function="Pref.getUIColor"
-		 parameter="SystemChatColor" />
-		<color_swatch.commit_callback
-		 function="Pref.applyUIColor"
-		 parameter="SystemChatColor" />
-	</color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="text_box4"
-     top_delta="5"
-     width="95">
-        System
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     color="Red"
-     follows="left|top"
-     height="47"
-     layout="topleft"
-     left="190"
-     name="script_error"
-     top_pad="-15"
-     width="44">
-		<color_swatch.init_callback
-		 function="Pref.getUIColor"
-		 parameter="ScriptErrorColor" />
-		<color_swatch.commit_callback
-		 function="Pref.applyUIColor"
-		 parameter="ScriptErrorColor" />
-	</color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="text_box5"
-     top_delta="5"
-     width="95">
-        Errors
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     color="EmphasisColor_35"
-     follows="left|top"
-     height="47"
-     layout="topleft"
-     left="360"
-     name="objects"
-     top_pad="-15"
-     width="44" >
-		<color_swatch.init_callback
-		 function="Pref.getUIColor"
-		 parameter="ObjectChatColor" />
-		<color_swatch.commit_callback
-		 function="Pref.applyUIColor"
-		 parameter="ObjectChatColor" />
-	</color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="text_box6"
-     top_delta="5"
-     width="95">
-        Objects
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     color="LtYellow"
-     follows="left|top"
-     height="47"
-     layout="topleft"
-     left="40"
-     name="owner"
-     top_pad="22"
-     width="44" >
-		<color_swatch.init_callback
-		 function="Pref.getUIColor"
-		 parameter="llOwnerSayChatColor" />
-		<color_swatch.commit_callback
-		 function="Pref.applyUIColor"
-		 parameter="llOwnerSayChatColor" />
-	</color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="text_box7"
-     top_delta="5"
-     width="95">
-        Owner
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     color="EmphasisColor"
-     follows="left|top"
-     height="47"
-     layout="topleft"
-     left="190"
-     name="links"
-     top_pad="-15"
-     width="44" >
-		<color_swatch.init_callback
-		 function="Pref.getUIColor"
-		 parameter="HTMLLinkColor" />
-		<color_swatch.commit_callback
-		 function="Pref.applyUIColor"
-		 parameter="HTMLLinkColor" />
-	</color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="text_box9"
-     top_delta="5"
-     width="95">
-        URLs
-    </text>
+
     <check_box
      control_name="CloseChatOnReturn"
      follows="left|top"
@@ -316,7 +65,7 @@
      layout="topleft"
      left="30"
      name="CloseChatOnReturn"
-     top_pad="32"
+     top_pad="10"
      width="256" />
     <check_box
      control_name="PlayTypingAnim"
@@ -346,6 +95,18 @@
      name="plain_text_chat_history"
      top_pad="5"
      width="400" />
+    
+    <check_box
+     control_name="UseChatBubbles"
+     follows="left|top"
+     height="16"
+     label="Bubble Chat"
+     layout="topleft"
+     left_delta="0"
+     top_pad="5"
+     name="bubble_text_chat"
+     width="150" /> 
+    
     <text
      name="show_ims_in_label"
      follows="left|top"
@@ -355,7 +116,8 @@
      width="170"
      top_pad="14">
      Show IMs in:
-    </text>
+    </text>
+    
     <text
      name="requires_restart_label"
      follows="left|top"
@@ -395,6 +157,37 @@
       value="1"
       width="150" />
     </radio_group>
+    
+    <text
+     name="disable_toast_label"
+     follows="left|top"
+     layout="topleft"
+     top_pad="14" 
+     left="30" 
+     height="10"
+     width="180">
+      Enable incoming chat popups:
+      </text>
+    <check_box
+     control_name="EnableGroupChatPopups"
+     name="EnableGroupChatPopups"
+     label="Group Chats" 
+     layout="topleft"
+     top_pad="5" 
+     left_delta="10" 
+     height="20"
+     tool_tip="Check to see popups when a Group Chat message arrives"
+     width="400" />
+    <check_box
+     control_name="EnableIMChatPopups"
+     name="EnableIMChatPopups"
+     label="IM Chats" 
+     layout="topleft"
+     top_pad="5"
+     height="16"
+     tool_tip="Check to see popups when an instant message arrives"
+     width="400" />
+    
     <check_box
      control_name="TranslateChat"
      enabled="true"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 6dc419a96c..0c75399764 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -317,7 +317,7 @@
    layout="topleft"
    left="30"
    height="12"
-   name="bubble_chat"
+   name="floater_opacity"
    top_pad="15"
    width="120"
    >
@@ -355,7 +355,7 @@
    left="50"
    max_val="1.00"
    min_val="0.00"
-   name="active"
+   name="inactive"
    show_text="true"
    top_pad="5"
    width="415" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index de47abf0f9..d453f6dc64 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -10,16 +10,30 @@
  top="1"
  width="517">
 
-   <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="15"
+    <check_box
      layout="topleft"
-     left="30"
-     name="firestorm"
-     top="10"
-     width="400">
-        Placeholder for Firestorm-specific preferences:
+     follows="left|top"
+     top_pad="20"
+     left_delta="20"
+     width="175"
+     height="20"
+     name="checkMiscRLVa"
+     label="Allow Remote Scripted Viewer Controls  (RLVa)"
+    >
+    <check_box.commit_callback
+     function="RLV.ToggleEnabled" />
+    </check_box>
+    <text
+         layout="topleft"
+         follows="left|top"
+         top_delta="6" 
+         left_pad="100" 
+         height="20"
+         width="150"
+         name="textMiscRLVaRestart"
+         text_color="White_25"
+        >
+                                            (requires restart)
     </text>
+    
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 392d50fc42..15923d029d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -298,51 +298,38 @@
     tool_tip="Highlight the name tags of your friends"
     top_delta="0" />
 
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="15"
-     layout="topleft"
-     left="30"
-     name="effects_color_textbox"
-     top_pad="9"
-     width="200">
-        My effects:
-    </text>
+	<check_box
+	control_name="UseDisplayNames"
+	follows="top|left"
+	height="16"
+	label="View Display Names"
+	layout="topleft"
+	left="70"
+	name="display_names_check"
+	width="237"
+	tool_tip="Check to use display names in chat, IM, name tags, etc."
+	top_pad="5"/>
+
     <text
       type="string"
       length="1"
       follows="left|top"
       height="13"
       layout="topleft"
-      left_pad="5"
+      left="30"
+      top_pad="10"
       name="title_afk_text"
       top_delta="0" 
       width="190">
     Away timeout:
     </text>
-    <color_swatch
-	 can_apply_immediately="true"
-     follows="left|top"
-     height="50"
-     layout="topleft"
-     left="50"
-     name="effect_color_swatch"
-     tool_tip="Click to open Color Picker"
-     width="38">
-		<color_swatch.init_callback
-		 function="Pref.getUIColor"
-		 parameter="EffectColor" />
-		<color_swatch.commit_callback
-		 function="Pref.applyUIColor"
-		 parameter="EffectColor" />
-	</color_swatch>
+
   <combo_box
             height="23"
             layout="topleft"
             control_name="AFKTimeout"
-            left_pad="160"
+            left="40"
+            top_pad="10"
             label="Away timeout:"
             top_delta="0"
             name="afk"
@@ -368,17 +355,7 @@
      name="item4"
      value="0" />
   </combo_box>
-  <check_box
-control_name="UseDisplayNames"
-follows="top|left"
-height="14"
-label="View Display Names"
-layout="topleft"
-left="30"
-name="display_names_check"
-width="237"
-tool_tip="Check to use display names in chat, IM, name tags, etc."
-top_pad="20"/>
+  
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 13bbfcde3a..591c21b428 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -174,49 +174,17 @@
 		width="188">
 			Movement:
 		</text>
-		<check_box
-		control_name="DoubleClickTeleport"
-		height="16"
-		initial_value="true"
-		label="Teleport to wherever you double-click in-world"
-		layout="topleft"
-		left="78"
-		name="DoubleClickTeleport"
-		tool_tip="Set this to teleport to a point you double click on in-world"
-		top_pad="12"
-		width="335"/>
-		<check_box
-		control_name="DoubleClickAutoPilot"
-		height="16"
-		initial_value="true"
-		label="Walk or run to wherever you double-click in-world"
-		layout="topleft"
-		left_delta="0"
-		name="DoubleClickAutoPilot"
-		tool_tip="Set this to walk or run your avatar to a point you double click on in-world (teleport on double click over-rides this)"
-		top_pad="7"
-		width="325"/> 
-		<check_box
-		control_name="NumpadControl"
-		height="16"
-		initial_value="true"
-		label="Number keys move avatar (when numlock is off)"
-		layout="topleft"
-		left_delta="0"
-		name="NumpadControl"
-		tool_tip="Set this so that the number keys move your avatar when numlock is not set"
-		top_pad="7"
-		width="256" />
+	
 <check_box
    control_name="ArrowKeysAlwaysMove"
    follows="left|top"
    height="20"
    label="Arrow keys always move me"
    layout="topleft"
-   left_delta="0"
+   left_delta="48"
    name="arrow_keys_move_avatar_check"
    width="237"
-   top_pad="1"/>
+   top_pad="10"/>
   <check_box
    control_name="AllowTapTapHoldRun"
    follows="left|top"
@@ -227,5 +195,42 @@
    name="tap_tap_hold_to_run"
    width="237"
    top_pad="0"/>		
-  </radio_group>
+  <check_box
+   follows="left|top"
+   height="20"
+   label="Allow double-clicking a spot to move my avatar:"
+   layout="topleft"
+   left_delta="0"
+   name="double_click_chkbox"
+   width="237"
+   top_pad="0">
+   <check_box.commit_callback
+    function="Pref.CommitDoubleClickChekbox"/>
+  </check_box>
+  
+  <radio_group
+     height="20"
+     layout="topleft"
+     left_delta="17"
+     top_pad="2"
+     name="double_click_action">
+    <radio_item
+     height="16"
+     label="By Teleporting"
+     layout="topleft"
+     left="0"
+     name="radio_teleport"
+     top_delta="20"
+     width="100" />
+    <radio_item
+     height="16"
+     label="By Walking"
+     left_pad="0"
+     layout="topleft"
+     name="radio_autopilot"
+     top_delta="0"
+     width="75" />
+    <radio_group.commit_callback
+	     function="Pref.CommitRadioDoubleClick"/>
+	</radio_group>
 </panel>