5 files changed, 57 insertions, 19 deletions

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" />