From c04f0fc24faeda8747a4b63cb1e2aec782228a5e Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Wed, 19 Jan 2011 16:45:34 -0800
Subject: [PATCH 1/5] Innitial commit of prefs re-factoring. (bsd)

---
 indra/newview/CMakeLists.txt                  |   2 +
 .../default/xui/en/floater_preferences.xml    |  10 +-
 .../xui/en/panel_preferences_firestorm.xml    | 279 +++++++++++++-----
 3 files changed, 205 insertions(+), 86 deletions(-)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0d8c1afc46..f4787808a1 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -580,6 +580,7 @@ set(viewer_SOURCE_FILES
     llxmlrpclistener.cpp
     llxmlrpctransaction.cpp
     noise.cpp
+	panel_prefs_firestorm.cpp
     pipeline.cpp
     rlvhandler.cpp
     rlvhelper.cpp
@@ -1122,6 +1123,7 @@ set(viewer_HEADER_FILES
     llxmlrpctransaction.h
     macmain.h
     noise.h
+	panel_prefs_firestorm.h
     pipeline.h
     rlvdefines.h
     rlvhandler.h
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index ca57f59281..c2e30fe108 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  open_centered="true"
  default_tab_group="1"
- height="460"
+ height="500"
  layout="topleft"
  name="Preferences"
  help_topic="preferences"
@@ -18,7 +18,7 @@
      layout="topleft"
      right="-105"
      name="OK"
-     top="433"
+     top="467"
      width="90">
         <button.commit_callback
          function="Pref.OK" />
@@ -39,7 +39,7 @@
     <tab_container
      follows="all"
      halign="left"
-     height="410"
+     height="440"
      layout="topleft"
      left="0"
      name="pref core"
@@ -97,7 +97,7 @@
          label="Move &amp; View"
          layout="topleft"
          help_topic="preferences_move_tab"
-         name="move" />
+         name="audio" />
         <panel
 		 class="panel_preference"
          filename="panel_preferences_alerts.xml"
@@ -134,7 +134,7 @@
          help_topic="preferences_skins_tab"
          name="skins" /> 
 		<panel
-         class="panel_preference"
+         class="panel_preference_firestorm"
          filename="panel_preferences_firestorm.xml"
          label="Firestorm"
          layout="topleft"
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 65b939c92f..ddf10a2e60 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="left|top|right|bottom"
- height="408"
+ height="500"
  label="Firestorm"
  layout="topleft"
  left="102"
@@ -10,85 +10,202 @@
  top="1"
  width="517">
 
-    <check_box
-     control_name="RestrainedLove"
-     layout="topleft"
-     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.enabled_callback
-     function="RLV.CheckEnabled" />
-    </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>
-  
-     <text
-      follows="left|top"
-      layout="topleft"
-      left="24"
-      height="12"
-      name="tab_direction_label"
-      width="120"
-      top_pad="10">
-      Chat Tab Mode Orientation:
-    </text>
-    <text
-     name="requires_restart_label"
-     follows="left|top"
-     layout="topleft"
-     top_delta="0"
-     left="150"
-        height="20"
+  <tab_container
+    label="Firestorm Prefs"
+    top="-70" 
+    height="460"
+    left="0"
+    mouse_opaque="false"
+    name="tabs"
+    tab_min_width="50"
+    tab_position="top"
+    width="517"
+    bg_opaque_color="0,0,0,0.0">
+    <tab_container
+      label="Page 1"
+      bottom="0"
+      height="500"
+      left="0"
+      mouse_opaque="false"
+      name="page1"
+      tab_min_width="50"
+      tab_position="top"
+      width="517"
+      bg_opaque_color="0,0,0,0.0">
+      <panel
+        border="true"
+        bottom="-500"
+        follows="left|top|right|bottom"
+        height="500"
+        label="Tab1-1"
+        left="1"
+        mouse_opaque="true"
+        name="tab1-1"
+        width="517">
+        <check_box
+          control_name="RestrainedLove"
+          layout="topleft"
+          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.enabled_callback
+          function="RLV.CheckEnabled" />
+        </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>
+        <text
+          follows="left|top"
+          layout="topleft"
+          left="24"
+          height="12"
+          name="tab_direction_label"
+          width="120"
+          top_pad="10">
+          Chat Tab Mode Orientation:
+        </text>
+        <text
+          name="requires_restart_label"
+          follows="left|top"
+          layout="topleft"
+          top_delta="0"
+          left="150"
+          height="20"
           width="130"
-     text_color="White_25">
-      (requires restart)
-    </text>
-    <radio_group
-     height="16"
-     layout="topleft"
-     left="40"
-     control_name="ChatTabDirection"
-     name="chat_tab_direction"
-     top_pad="0"
-     tool_tip="Change flow of the chat/IM tabs between horizontal and vertical when consolidated tab mode is active.
-(Requires restart)"
-     width="331">
-     <radio_item
-       height="16"
-       label="Horizontal"
-       layout="topleft"
-       left="0"
-       name="radio_horizontal"
-       value="0"
-       top="0"
-       width="150" />
-     <radio_item
-       height="16"
-       label="Vertical"
-       layout="topleft"
-       left_delta="160"
-       name="radio_vertical"
-       value="1"
-       width="150" />
-    </radio_group>
-  
-    
+          text_color="White_25">
+          (requires restart)
+        </text>
+        <radio_group
+          height="16"
+          layout="topleft"
+          left="40"
+          control_name="ChatTabDirection"
+          name="chat_tab_direction"
+          top_pad="0"
+          tool_tip="Change flow of the chat/IM tabs between horizontal and vertical when consolidated tab mode is active.
+        (Requires restart)"
+          width="331">
+          <radio_item
+             height="16"
+             label="Horizontal"
+             layout="topleft"
+             left="0"
+             name="radio_horizontal"
+             value="0"
+             top="0"
+             width="150" />
+          <radio_item
+            height="16"
+            label="Vertical"
+            layout="topleft"
+            left_delta="160"
+            name="radio_vertical"
+            value="1"
+            width="150" />
+        </radio_group>
+      </panel>
+      <panel
+        border="true"
+        bottom="-500"
+        follows="left|top|right|bottom"
+        height="500"
+        label="Tab1-2"
+        left="1"
+        mouse_opaque="true"
+        name="tab1-2"
+        width="517">
+        <text
+          name="requires_restart_label"
+          follows="left|top"
+          layout="topleft"
+          top_delta="0"
+          left="150"
+          height="20"
+          width="130"
+          text_color="White_25">
+          (requires restart)
+        </text>
+      </panel>
+      <!--CmdLine-->
+      <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="CmdLine" left="1" mouse_opaque="true" name="tab1-3" width="517">
+        <button bottom="-25" follows="left|top" font="SansSerifSmall" height="18" label="?" name="PhoenixHelp_CmdLine" tool_tip="Click here for help regarding the settings in this page." right="490" width="18"/>
+        <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Enable usage of chat bar as a command line" left="5" mouse_opaque="true" name="chat_cmd_toggle" radio_style="false" width="270" control_name="PhoenixCmdLine"/>
+        <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="10" name="loltxt2" width="512">Teleport within sim (usage: cmd x y z)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLinePos" control_name="PhoenixCmdLinePos" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt3" width="512">Teleport to ground (usage: cmd)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineGround" control_name="PhoenixCmdLineGround" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt4" width="512">Teleport to altitude (usage: cmd z)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineHeight" control_name="PhoenixCmdLineHeight" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt5" width="512">Teleport home (usage: cmd)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineTeleportHome" control_name="PhoenixCmdLineTeleportHome" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt6" width="512">Rez a platform (usage: cmd 0 - 30)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineRezPlatform" control_name="PhoenixCmdLineRezPlatform" width="200"/>
+        <slider bottom_delta="-20" left="15" name="PhoenixCmdLinePlatformSize" control_name="PhoenixCmdLinePlatformSize" decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5" initial_val="5" label="Width" label_width="30" max_val="30" min_val="5" mouse_opaque="true" show_text="true" width="200" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
+        <text bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt7" width="512">Teleport to sim x (usage: cmd simname)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineMapTo" control_name="PhoenixCmdLineMapTo" width="200"/>
+        <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true" name="toggle" radio_style="false" width="270" control_name="PhoenixCmdLineMapToKeepPos"/>
+        <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt8" width="512">Calc. expressions (usage: cmd SIN(2+2))</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineCalc" control_name="PhoenixCmdLineCalc" width="200"/>
+        <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" width="512">Add autocorrect word(cmd list|bad|good)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineAutocorrect" control_name="PhoenixCmdLineAutocorrect" width="200"/>
+        <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="310" left="240" name="EmDivisor" width="0"/>
+        <text bottom_delta="326" follows="left|top" font="SansSerifSmall" height="16" left_delta="10" name="loltxt9" width="512">Change Draw Distance (usage: cmd meters)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineDrawDistance" control_name="PhoenixCmdLineDrawDistance" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt10" width="512">Teleport to cam position (usage: cmd)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdTeleportToCam" control_name="PhoenixCmdTeleportToCam" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt11" width="512">Get avatar name from key (usage: cmd key)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineKeyToName" control_name="PhoenixCmdLineKeyToName" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt12" width="512">Offer teleport to avatar (usage: cmd key)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineOfferTp" control_name="PhoenixCmdLineOfferTp" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt13" width="512">Teleport to avatar (usage: cmd name)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open." name="PhoenixCmdLineTP2" control_name="PhoenixCmdLineTP2" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt14" width="512">Turn AO on/off (usage: cmd on/off)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="" name="PhoenixCmdLineAO" control_name="PhoenixCmdLineAO" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt15" width="512">Clear the chat history (usage: cmd)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="Clears the Chat History to prevent lag effects from chat spammers." name="PhoenixCmdLineClearChat" control_name="PhoenixCmdLineClearChat" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt15" width="512">Set the media url (usage: cmd url type)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="Sets and plays your media stream to the entered url" name="PhoenixCmdLineMedia" control_name="PhoenixCmdLineMedia" width="200"/>
+        <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="loltxt15" width="512">Set the music stream url (usage: cmd url)</text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" tool_tip="sets and plays your music stream to the entered url" name="PhoenixCmdLineMusic" control_name="PhoenixCmdLineMusic" width="200"/>
+      </panel>
+    </tab_container>
+    <tab_container
+      label="Page 2"
+      bottom="0"
+      height="400"
+      left="0"
+      mouse_opaque="false"
+      name="page2"
+      tab_min_width="50"
+      tab_position="top"
+      width="500"
+      bg_opaque_color="0,0,0,0.0">
+      <panel
+          border="true"
+          bottom="-400"
+          follows="left|top|right|bottom"
+          height="400"
+          label="Tab2-1"
+          left="1"
+          mouse_opaque="true"
+          name="tab2-1"
+          width="517">
+      </panel>
+    </tab_container>
+  </tab_container>
 </panel>

From 7383a3e16503a40389f786eca731444ba92ab05e Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Wed, 19 Jan 2011 16:46:18 -0800
Subject: [PATCH 2/5] Forgot 2 files in last commit (bsd)

---
 indra/newview/panel_prefs_firestorm.cpp | 50 +++++++++++++++++++++++++
 indra/newview/panel_prefs_firestorm.h   | 23 ++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 indra/newview/panel_prefs_firestorm.cpp
 create mode 100644 indra/newview/panel_prefs_firestorm.h

diff --git a/indra/newview/panel_prefs_firestorm.cpp b/indra/newview/panel_prefs_firestorm.cpp
new file mode 100644
index 0000000000..98dff7a6de
--- /dev/null
+++ b/indra/newview/panel_prefs_firestorm.cpp
@@ -0,0 +1,50 @@
+/*${License blank}*/
+#include "llviewerprecompiledheaders.h"
+#include "panel_prefs_firestorm.h"
+
+
+static LLRegisterPanelClassWrapper<PanelPreferenceFirestorm> t_pref_fs("panel_preference_firestorm");
+
+PanelPreferenceFirestorm::PanelPreferenceFirestorm() : LLPanelPreference(), m_calcLineEditor(NULL), m_acLineEditor(NULL), m_tp2LineEditor(NULL), m_clearchatLineEditor(NULL), m_musicLineEditor(NULL)
+{
+}
+
+
+BOOL PanelPreferenceFirestorm::postBuild()
+{
+	m_calcLineEditor = getChild<LLLineEditor>("PhoenixCmdLineCalc");
+	m_acLineEditor = getChild<LLLineEditor>("PhoenixCmdLineAutocorrect");
+	m_tp2LineEditor = getChild<LLLineEditor>("PhoenixCmdLineTP2");
+	m_clearchatLineEditor = getChild<LLLineEditor>("PhoenixCmdLineClearChat");
+	m_musicLineEditor = getChild<LLLineEditor>("PhoenixCmdLineMusic");
+	if(m_calcLineEditor)
+	{
+		m_calcLineEditor->setEnabled(FALSE);
+	}
+	if(m_acLineEditor)
+	{
+		m_acLineEditor->setEnabled(FALSE);
+	}
+	if(m_tp2LineEditor)
+	{
+		m_tp2LineEditor->setEnabled(FALSE);
+	}
+	if(m_clearchatLineEditor)
+	{
+		m_clearchatLineEditor->setEnabled(FALSE);
+	}
+	if(m_musicLineEditor)
+	{
+		m_musicLineEditor->setEnabled(FALSE);
+	}
+	return LLPanelPreference::postBuild();	
+}
+
+void PanelPreferenceFirestorm::apply()
+{
+}
+
+
+void PanelPreferenceFirestorm::cancel()
+{
+}
diff --git a/indra/newview/panel_prefs_firestorm.h b/indra/newview/panel_prefs_firestorm.h
new file mode 100644
index 0000000000..6f8aa3562c
--- /dev/null
+++ b/indra/newview/panel_prefs_firestorm.h
@@ -0,0 +1,23 @@
+/*${License blank}*/
+#ifndef panel_prefs_firestorm
+#define panel_prefs_firestorm
+#include "llfloaterpreference.h"
+#include "lllineeditor.h"
+class LLLineEditor;
+class PanelPreferenceFirestorm : public LLPanelPreference
+{
+public:
+	PanelPreferenceFirestorm();
+	
+	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void apply();
+	/*virtual*/ void cancel();
+
+protected:
+	LLLineEditor* m_calcLineEditor;
+	LLLineEditor* m_acLineEditor;
+	LLLineEditor* m_tp2LineEditor;
+	LLLineEditor* m_clearchatLineEditor;
+	LLLineEditor* m_musicLineEditor;
+};
+#endif
\ No newline at end of file

From f6d6d44b8da67d0bc9994d44c82d25e63c9587a6 Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Thu, 20 Jan 2011 19:25:09 -0800
Subject: [PATCH 3/5] Adding the AO's line to the disabling of unused list to
 kill

---
 indra/newview/panel_prefs_firestorm.cpp | 5 +++++
 indra/newview/panel_prefs_firestorm.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/indra/newview/panel_prefs_firestorm.cpp b/indra/newview/panel_prefs_firestorm.cpp
index 98dff7a6de..c1d4ce59af 100644
--- a/indra/newview/panel_prefs_firestorm.cpp
+++ b/indra/newview/panel_prefs_firestorm.cpp
@@ -17,6 +17,7 @@ BOOL PanelPreferenceFirestorm::postBuild()
 	m_tp2LineEditor = getChild<LLLineEditor>("PhoenixCmdLineTP2");
 	m_clearchatLineEditor = getChild<LLLineEditor>("PhoenixCmdLineClearChat");
 	m_musicLineEditor = getChild<LLLineEditor>("PhoenixCmdLineMusic");
+	m_aoLineEditor = getChild<LLLineEditor>("PhoenixCmdLineAO");
 	if(m_calcLineEditor)
 	{
 		m_calcLineEditor->setEnabled(FALSE);
@@ -37,6 +38,10 @@ BOOL PanelPreferenceFirestorm::postBuild()
 	{
 		m_musicLineEditor->setEnabled(FALSE);
 	}
+	if(m_aoLineEditor)
+	{
+		m_aoLineEditor->setEnabled(FALSE);
+	}
 	return LLPanelPreference::postBuild();	
 }
 
diff --git a/indra/newview/panel_prefs_firestorm.h b/indra/newview/panel_prefs_firestorm.h
index 6f8aa3562c..8ab8032e82 100644
--- a/indra/newview/panel_prefs_firestorm.h
+++ b/indra/newview/panel_prefs_firestorm.h
@@ -19,5 +19,6 @@ protected:
 	LLLineEditor* m_tp2LineEditor;
 	LLLineEditor* m_clearchatLineEditor;
 	LLLineEditor* m_musicLineEditor;
+	LLLineEditor* m_aoLineEditor;
 };
 #endif
\ No newline at end of file

From c48d6b1a02910414ca156a68fe07da4d28113a3b Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Thu, 20 Jan 2011 20:54:06 -0800
Subject: [PATCH 4/5] Fixing broken layout of prefs tabs that became broken due
 to enlarging of the main floater.

---
 .../skins/default/xui/en/panel_preferences_privacy.xml      | 6 +++---
 .../skins/default/xui/en/panel_preferences_sound.xml        | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index f86be6f409..caf05ed1cf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -21,7 +21,7 @@
      layout="topleft"
      left="30"
      name="clear_cache"
-     top="10"
+     top="1"
      width="145">
         <button.commit_callback
          function="Pref.WebClearCache" />
@@ -35,7 +35,7 @@
      left_pad="10"
      mouse_opaque="false"
      name="cache_size_label_l"
-     top_delta="3"
+     top_delta="35"
      text_color="LtGray_50"
      width="300">
        (Locations, images, web, search history)
@@ -158,7 +158,7 @@
      layout="topleft"
      left_pad="5"
      name="log_path_button"
-     top_delta="0"
+     top_delta="-30"
      width="145">
         <button.commit_callback
          function="Pref.LogPath" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 2a7435d71b..e807d11e9d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -299,6 +299,7 @@
 		value="true"
 		follows="left|bottom|right"
 		height="15"
+    bottom_delta="10" 
 		tool_tip="Check this to let media auto-play if it wants"
 		label="Allow Media to auto-play"
 		top_pad="1"
@@ -323,7 +324,7 @@
      left="25"
      name="voice_chat_settings"
      width="180"
-     top_pad="7">
+     top_pad="40">
 	  Voice Chat Settings
     </text>
     <text

From 14841b30511973a05b1a6585a4e5fbab6ec3894e Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Wed, 16 Feb 2011 17:14:05 -0800
Subject: [PATCH 5/5] Cleaned up prefrence page layout messup.

---
 .../skins/default/xui/en/panel_preferences_privacy.xml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 1add526986..af896c5bc7 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -21,7 +21,7 @@
      layout="topleft"
      left="30"
      name="clear_cache"
-     top="10"
+     top="1"
      width="145">
         <button.commit_callback
          function="Pref.WebClearCache" />
@@ -35,7 +35,7 @@
      left_pad="10"
      mouse_opaque="false"
      name="cache_size_label"
-     top_delta="3"
+     top_delta="35"
      text_color="LtGray_50"
      width="300">
        (Locations, images, web, search history)
@@ -158,7 +158,7 @@
      layout="topleft"
      left_pad="5"
      name="open_log_path_button"
-     top_delta="0"
+     top_delta="-30"
      width="40">
         <button.commit_callback
          function="Pref.BrowseLogPath" />
@@ -200,7 +200,7 @@
      left_pad="10"
      mouse_opaque="false"
      name="block_list_label"
-     top_delta="3"
+     top_delta="35"
      text_color="LtGray_50"
      width="300">
        (People and/or Objects you have blocked)