Added AO toolbar option to preferences > advanced

3 files changed, 19 insertions, 2 deletions

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index a9500f7..087acc9 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -48,6 +48,9 @@
 LLPrefsAdvanced* LLPrefsAdvanced::sInstance;
 
 LLPrefsAdvanced::LLPrefsAdvanced()
+:
+        mWLControl(FALSE),
+        mAOControl(FALSE)
 {
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_advanced.xml");
         if(sInstance)delete sInstance;
@@ -99,6 +102,10 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("show_timestamps_check", gSavedSettings.getBOOL("ShowTimestamps"));
         childSetValue("arrow_keys_move_avatar_check", gSavedSettings.getBOOL("ArrowKeysMoveAvatar"));
 
+        static BOOL *sEnableAORemote = rebind_llcontrol<BOOL>("EnableAORemote", &gSavedSettings, true);
+        childSetValue("ao_remote_check", *sEnableAORemote);
+        mAOControl = (*sEnableAORemote);
+
         refresh();
 
         return TRUE;
@@ -198,6 +205,9 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setBOOL("ArrowKeysMoveAvatar", childGetValue("arrow_keys_move_avatar_check"));
         gSavedSettings.setBOOL("ScriptErrorsAsChat", childGetValue("script_errors_as_chat"));
         gSavedSettings.setBOOL("ShowTimestamps", childGetValue("show_timestamps_check"));
+
+        static BOOL *sEnableAORemote = rebind_llcontrol<BOOL>("EnableAORemote", &gSavedSettings, true);
+        mAOControl = *sEnableAORemote;
 }
 
 void LLPrefsAdvanced::cancel()
@@ -208,6 +218,7 @@ void LLPrefsAdvanced::cancel()
 //      LLVOAvatar::sCloud.mPartData.mEndColor = mCloudEndColor;
 
         gSavedSettings.setBOOL("EnableWindlightRemote", mWLControl);
+        gSavedSettings.setBOOL("EnableAORemote", mAOControl);
 }
 
 void LLPrefsAdvanced::refresh()
diff --git a/linden/indra/newview/llprefsadvanced.h b/linden/indra/newview/llprefsadvanced.h
index b863db3..9f02cbf 100644
--- a/linden/indra/newview/llprefsadvanced.h
+++ b/linden/indra/newview/llprefsadvanced.h
@@ -64,6 +64,7 @@ private:
         LLColor4 mCloudEndColor;
         LLUUID mCloudTextureID;
         BOOL mWLControl;
+        BOOL mAOControl;
 };
 
 #endif // LLPREFSADVANCED_H
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 0820297..8585a8e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -49,11 +49,16 @@ USE left="270" FOR TABBING OPTIONS
            label="Show WindLight toolbar" left="50"  mouse_opaque="true"
            name="toggle_windlight_control" radio_style="false" width="237"
            control_name="EnableWindlightRemote" />
-      <check_box bottom_delta="-18" enabled="true"
+      <check_box bottom_delta="0" enabled="true"
            follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-           label="Use legacy pie menus" left_delta="0"
+           label="Use legacy pie menus" left="270"
            mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
            width="256" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show AO toolbar" left="50"  mouse_opaque="true"
+           name="toggle_ao_control" radio_style="false" width="237"
+           control_name="EnableAORemote" />
 
 
       <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"