11 files changed, 287 insertions, 31 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 796e98e..a3fc7d9 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -65,6 +65,7 @@ include_directories(
     )
 
 set(viewer_SOURCE_FILES
+        aoremotectrl.cpp
     emeraldboobutils.cpp
     floaterao.cpp
     floaterbusy.cpp
@@ -493,6 +494,7 @@ endif (LINUX)
 set(viewer_HEADER_FILES
     CMakeLists.txt
     ViewerInstall.cmake
+    aoremotectrl.h
     emeraldboobutils.h
     floaterao.h
     floaterbusy.h
@@ -1225,6 +1227,9 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/mime_types.xml
     skins/default/xui/en-us/notifications.xml
     skins/default/xui/en-us/notify.xml
+    skins/default/xui/en-us/panel_ao_remote_controls.xml
+    skins/default/xui/en-us/panel_ao_remote.xml
+    skins/default/xui/en-us/panel_ao_remote_expanded.xml
     skins/default/xui/en-us/panel_audio_device.xml
     skins/default/xui/en-us/panel_audio.xml
     skins/default/xui/en-us/panel_avatar_classified.xml
diff --git a/linden/indra/newview/aoremotectrl.cpp b/linden/indra/newview/aoremotectrl.cpp
new file mode 100644
index 0000000..8cafdd9
--- /dev/null
+++ b/linden/indra/newview/aoremotectrl.cpp
@@ -0,0 +1,122 @@
+/**
+* @file aoremotectrl.cpp
+* @brief toolbar remote for toggling the viewer AO
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2010, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "aoremotectrl.h"
+
+#include "floaterao.h"
+#include "llbutton.h"
+#include "lloverlaybar.h"
+#include "lluictrlfactory.h"
+#include "llviewercontrol.h"
+
+
+AORemoteCtrl::AORemoteCtrl()    
+{
+        setIsChrome(TRUE);
+        build();
+        setFocusRoot(TRUE);
+}
+
+AORemoteCtrl::~AORemoteCtrl()
+{
+}
+
+void AORemoteCtrl::draw()
+{
+        LLButton* expand_button = getChild<LLButton>("popup_btn");
+        if (expand_button)
+        {
+                if (expand_button->getToggleState())
+                {
+                        expand_button->setImageOverlay("arrow_down.tga");
+                }
+                else
+                {
+                        expand_button->setImageOverlay("arrow_up.tga");
+                }
+        }
+
+        LLPanel::draw();
+}
+
+void AORemoteCtrl::build()
+{
+        if (gSavedSettings.getBOOL("ShowAOSitPopup"))
+        {
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_ao_remote_expanded.xml");
+        }
+        else
+        {
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_ao_remote.xml");
+        }
+}
+
+BOOL AORemoteCtrl::postBuild()
+{
+        
+        childSetAction("ao_btn", onClickToggleAO, this);
+        childSetAction("ao_sit_btn", onClickToggleAOSit, this);
+        childSetAction("ao_show_btn", onClickShowAO, this);
+        childSetAction("popup_btn", onClickPopupBtn, this);
+
+        return TRUE;
+}
+
+// static
+void AORemoteCtrl::onClickToggleAO(void* data)
+{
+        BOOL ao_enable = gSavedSettings.getBOOL("AOEnabled");
+        gSavedSettings.setBOOL("AOEnabled", !ao_enable);
+}
+
+//static 
+void AORemoteCtrl::onClickToggleAOSit(void* data)
+{
+        BOOL sit_enable = gSavedSettings.getBOOL("AOSitsEnabled");
+        gSavedSettings.setBOOL("AOSitsEnabled", !sit_enable);
+}
+
+//static 
+void AORemoteCtrl::onClickShowAO(void* data)
+{
+        LLFloaterAO::show(NULL);
+}
+
+//static
+void AORemoteCtrl::onClickPopupBtn(void* data)
+{
+        AORemoteCtrl* remotep = (AORemoteCtrl*)data;
+
+        remotep->deleteAllChildren();
+        remotep->build();
+        gOverlayBar->layoutButtons();
+}
diff --git a/linden/indra/newview/aoremotectrl.h b/linden/indra/newview/aoremotectrl.h
new file mode 100644
index 0000000..ca74e0d
--- /dev/null
+++ b/linden/indra/newview/aoremotectrl.h
@@ -0,0 +1,54 @@
+/**
+* @file aoremotectrl.h
+* @brief toolbar remote for toggling the viewer AO
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2010, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef AOREMOTECTRL_H
+#define AOREMOTECTRL_H
+
+#include "llpanel.h"
+
+class AORemoteCtrl : public LLPanel
+{
+public:
+        AORemoteCtrl();
+        virtual ~AORemoteCtrl();
+        /*virtual*/ BOOL postBuild();
+        /*virtual*/ void draw();
+
+private:
+
+        void build();
+
+        static void onClickToggleAO(void* data);
+        static void onClickToggleAOSit(void* data);
+        static void onClickShowAO(void* data);
+        static void onClickPopupBtn(void* data);
+};
+
+#endif // AOREMOTECTRL_H
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index aa6b1fa..fa6e275 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -125,6 +125,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>EnableWindlightRemote</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable windlight quick access remote in toolbar</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>FloaterAnimationListRect</key>
   <map>
     <key>Comment</key>
@@ -586,6 +597,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ShowAOSitPopup</key>
+  <map>
+    <key>Comment</key>
+    <string>Show AO sit popup</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>ShowMiniMapRadar</key>
   <map>
     <key>Comment</key>
@@ -836,6 +858,17 @@
       <integer>100</integer>
     </array>
   </map>
+  <key>EnableAORemote</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable AO quick access remote in toolbar</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
 
   <!-- Begin: Boob physics -->
 
@@ -4342,17 +4375,6 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  <key>EnableWindlightRemote</key>
-  <map>
-    <key>Comment</key>
-    <string>Enable windlight quick access remote in toolbar</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>EnergyFromTop</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 9f3776f..6191a01 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -37,6 +37,7 @@
 
 #include "lloverlaybar.h"
 
+#include "aoremotectrl.h"
 #include "audioengine.h"
 #include "llrender.h"
 #include "llagent.h"
@@ -148,6 +149,13 @@ void* LLOverlayBar::createWindlightRemote(void* userdata)
         return self->mWindlightRemote;
 }
 
+void* LLOverlayBar::createAORemote(void* userdata)
+{
+        LLOverlayBar *self = (LLOverlayBar*)userdata;   
+        self->mAORemote = new AORemoteCtrl();
+        return self->mAORemote;
+}
+
 void* LLOverlayBar::createChatBar(void* userdata)
 {
         gChatBar = new LLChatBar();
@@ -159,6 +167,7 @@ LLOverlayBar::LLOverlayBar()
                 mMediaRemote(NULL),
                 mVoiceRemote(NULL),
                 mWindlightRemote(NULL),
+                mAORemote(NULL),
                 mMusicState(STOPPED),
                 mOriginalIMLabel("")
 {
@@ -171,6 +180,7 @@ LLOverlayBar::LLOverlayBar()
         factory_map["media_remote"] = LLCallbackMap(LLOverlayBar::createMediaRemote, this);
         factory_map["voice_remote"] = LLCallbackMap(LLOverlayBar::createVoiceRemote, this);
         factory_map["windlight_remote"] = LLCallbackMap(LLOverlayBar::createWindlightRemote, this);
+        factory_map["ao_remote"] = LLCallbackMap(LLOverlayBar::createAORemote, this);
         factory_map["chat_bar"] = LLCallbackMap(LLOverlayBar::createChatBar, this);
         
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_overlaybar.xml", &factory_map);
@@ -330,7 +340,7 @@ void LLOverlayBar::refresh()
                 buttons_changed = TRUE;
         }
 
-
+        moveChildToBackOfTabGroup(mAORemote);
         moveChildToBackOfTabGroup(mWindlightRemote);
         moveChildToBackOfTabGroup(mMediaRemote);
         moveChildToBackOfTabGroup(mVoiceRemote);
@@ -341,6 +351,7 @@ void LLOverlayBar::refresh()
                 childSetVisible("media_remote_container", FALSE);
                 childSetVisible("voice_remote_container", FALSE);
                 childSetVisible("windlight_remote_container", FALSE);
+                childSetVisible("ao_remote_container", FALSE);
                 childSetVisible("state_buttons", FALSE);
         }
         else
@@ -349,6 +360,7 @@ void LLOverlayBar::refresh()
                 childSetVisible("media_remote_container", TRUE);
                 childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled());
                 childSetVisible("windlight_remote_container", gSavedSettings.getBOOL("EnableWindlightRemote"));
+                childSetVisible("ao_remote_container", gSavedSettings.getBOOL("EnableAORemote"));
                 childSetVisible("state_buttons", TRUE);
         }
 
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 50ad3d1..233f5c5 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -52,6 +52,7 @@ class LLStatGraph;
 class LLSlider;
 class LLVoiceRemoteCtrl;
 class LLWindlightRemoteCtrl;
+class AORemoteCtrl;
 
 class LLOverlayBar
 :       public LLPanel
@@ -92,6 +93,7 @@ protected:
         static void* createMediaRemote(void* userdata);
         static void* createVoiceRemote(void* userdata);
         static void* createWindlightRemote(void* userdata);
+        static void* createAORemote(void* userdata);
         static void* createChatBar(void* userdata);
 
         void enableMediaButtons();
@@ -100,6 +102,7 @@ protected:
         LLMediaRemoteCtrl*              mMediaRemote;
         LLVoiceRemoteCtrl*              mVoiceRemote;
         LLWindlightRemoteCtrl*  mWindlightRemote;
+        AORemoteCtrl*                   mAORemote;
         bool                            mBuilt; // dialog constructed yet?
         S32                                     mMusicState;
         std::string                     mOriginalIMLabel;
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml b/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml
index 2bcc9d1..134bd13 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml
@@ -35,7 +35,7 @@
 
   <button
       name="opencard"
-      label="Open Notecard"
+      label="View Notecard"
       font="SansSerifSmall"
       left="10"
       bottom_delta="-30"
@@ -55,10 +55,10 @@
                 />
   
   <check_box bottom_delta="-24" control_name="AOEnabled" enabled="true"
-       follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Enable Animations Override" left="10"
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Enable animations override" left="10"
        mouse_opaque="true" name="AOEnabled" radio_style="false" width="90" />
   <check_box bottom_delta="-18" control_name="AOSitsEnabled" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="true" label="Enable Sits Override" left="10"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="true" label="Enable sits override" left="10"
              mouse_opaque="true" name="AOSitsEnabled" radio_style="false" width="90" />
   
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -80,26 +80,31 @@
     follows="bottom|left"
                 />
   <button
-  name="nextstand"
-  tool_tip="next stand"
-  label="&gt;&gt;"
-  font="SansSerifSmall"
-  left="104"
-  bottom_delta="0"
-  width="90"
-  height="20"
-  follows="bottom|left"
+    name="nextstand"
+    tool_tip="next stand"
+    label="&gt;&gt;"
+    font="SansSerifSmall"
+    left="104"
+    bottom_delta="0"
+    width="90"
+    height="20"
+    follows="bottom|left"
                 />
   <check_box bottom_delta="-20" control_name="AOStandRandomize" enabled="true"
- follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Randomize Stand Order" left="10"
- mouse_opaque="true" name="AOStandRandomize" radio_style="false" width="200" />
+   follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Randomize stand order" left="10"
+   mouse_opaque="true" name="AOStandRandomize" radio_style="false" width="200" />
   <check_box bottom_delta="-20" control_name="AONoStandsInMouselook" enabled="true"
-         follows="left|top" font="SansSerifSmall" height="16" initial_value="true" label="Disable Stands in Mouselook" left="10"
-         mouse_opaque="true" name="AONoStandsInMouselook" radio_style="false" width="180" />
+         follows="left|top" font="SansSerifSmall" height="16" initial_value="true" 
+   label="Disable stands in mouselook" left="10" mouse_opaque="true"
+         name="AONoStandsInMouselook" radio_style="false" width="180" />
+  <check_box bottom_delta="-20" control_name="EnableAORemote" enabled="true"
+   follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+   label="Show AO toolbar" left="10" mouse_opaque="true" 
+   name="ao_remote_checkbox" radio_style="false" width="180" />
   <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16" control_name="AOStandInterval"
          increment="1" initial_val="20" left="10" max_val="9000" min_val="1.00"
-         mouse_opaque="true" name="standtime" label="Stand Time" label_width="80"
-         tool_tip="AO Stand Time in seconds" width="180" />
+         mouse_opaque="true" name="standtime" label="Stand time:" label_width="80"
+         tool_tip="AO stand time in seconds" width="180" />
 
   <button
     name="newcard"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote.xml
new file mode 100644
index 0000000..e13cd44
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
+     enabled="true" follows="right|bottom" height="20" left="0" mouse_opaque="true"
+     name="ao_remote" use_bounding_rect="true" width="96">
+  <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="22" left="0" width="96" />
+  <panel bottom="3" filename="panel_ao_remote_controls.xml" name="panel_ao_controls" height="20" left="0" width="96" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_controls.xml
new file mode 100644
index 0000000..5599dca
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_controls.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+     enabled="true" follows="right|bottom" height="20" left="0"
+     name="ao_controls" width="96">
+  <button bottom="-22" follows="left|bottom" font="SansSerif" halign="center" height="22"
+             label="AO Off" label_selected="AO On" left="3" name="ao_btn" control_name="AOEnabled"  
+             tool_tip="Click here to toggle the Animation Overrider" width="66" />
+  <button bottom="-22" follows="left|bottom" font="SansSerif" halign="center" height="22" toggle="true"
+             label="" left_delta="68" name="popup_btn" scale_image="true" control_name="ShowAOSitPopup"
+       tool_tip="Click here for more options" width="22" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_expanded.xml
new file mode 100644
index 0000000..29c34fb
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_expanded.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
+     enabled="true" follows="right|bottom" height="45" left="0" mouse_opaque="true"
+     name="ao_remote" use_bounding_rect="true" width="96">
+  <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="47" left="0" width="96" />
+  <button bottom="-20" control_name="AOSitsEnabled" enabled="true"
+             follows="left|top" font="SansSerif" height="22" label="AO Sits Off" label_selected="AO Sits On" 
+             mouse_opaque="true" name="ao_sit_btn" width="92" left="3" />
+  <panel bottom="13" filename="panel_ao_remote_controls.xml" name="panel_ao_controls" left="0" width="96" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index 8ad4fff..8863f10 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -45,7 +45,12 @@
                                      use_bounding_rect="true" width="395" />
                         </layout_stack>
                 </layout_panel>
-    <layout_panel auto_resize="false" bottom="0" left="0" min_width="184" mouse_opaque="false"
+    <layout_panel auto_resize="false" bottom="0" left="0" min_width="96" mouse_opaque="false"
+      name="ao_remote_container" use_bounding_rect="true" user_resize="false"
+      width="100">
+      <panel background_visible="false" border="false" bottom="0" name="ao_remote" />
+    </layout_panel>
+    <layout_panel auto_resize="false" bottom="0" left="0" min_width="182" mouse_opaque="false"
                         name="windlight_remote_container" use_bounding_rect="true" user_resize="false"
                         width="186">
       <panel background_visible="false" border="false" bottom="0" name="windlight_remote" />