Ported clientside AO from Emerald r1633

3 files changed, 331 insertions, 0 deletions

diff --git a/linden/indra/newview/skins/default/xui/de/floater_ao.xml b/linden/indra/newview/skins/default/xui/de/floater_ao.xml
new file mode 100644
index 0000000..c0731ea
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_ao.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="geminifloater" title="Animation Overrider">
+  <view_border name="ao_notecard"/>
+  <view_border name="ao_notecard_vis"/>
+  <text name="Give inventory" tool_tip="ZHAO Notiz hier fallen lassen. Konfiguration und Animationen müssen im gleichen Inventar Ordner liegen!">
+    ZHAO II Konfiguration hier fallen lassen.
+  </text>
+  <view_border name="ao_notecard_disp"/>
+  <text name="ao_nc_text" tool_tip="">
+    Aktuell: ITEM
+  </text>
+  <button name="opencard" label="Laden"/>
+  <button name="reloadcard" label="Neuladen"/>
+        <button label="Mehr &gt;&gt;" name="more_btn" tool_tip="Erweiterte Optionen"/>
+        <button label="&lt;&lt; Weniger" name="less_btn" tool_tip="Erweiterte Optionen"/>
+        <check_box label="Anims übersteuern" name="EmeraldAOEnabled"/>
+  <check_box label="Sitzen übersteuern" name="EmeraldAOSitsEnabled"/>
+  <text name="buttons_desc">
+    Stand:
+  </text>
+  <combo_box name="stands" label=""/>
+  <button name="prevstand" tool_tip="vorheriger Stand" label="&lt;&lt;"/>
+  <button name="nextstand" tool_tip="nächster Stand" label="&gt;&gt;"/>
+  <check_box label="zufällige Stand Ani" name="EmeraldAOStandRandomize"/>
+  <check_box label="keine Stand Ani bei Mouselook" name="EmeraldAONoStandsInMouselook"/>
+  <spinner name="standtime" label="Stand Zeit" tool_tip="AO Stand zeit in Sekunden"/>
+  <tab_container label="Default" name="tabcontainer">
+    <panel label="Standard Anis" name="tabdefaultanims">
+      <text name="textdefaultwalk">
+        Standard Gang:
+      </text>
+      <combo_box name="walks" label=""/>
+      <text name="textdefaultrun">
+        Standard Rennen:
+      </text>
+      <combo_box name="runs" label=""/>
+      <text name="textdefaultjump">
+        Standard Sprung:
+      </text>
+      <combo_box name="jumps" label=""/>
+      <text name="textdefaultsit">
+        Standard sitzen:
+      </text>
+      <combo_box name="sits" label=""/>
+      <text name="textdefaultgsit">
+        Standard Bodensitz:
+      </text>
+      <combo_box name="gsits" label=""/>
+      <text name="textdefaultcrouch">
+        Standard geduckt:
+      </text>
+      <combo_box name="crouchs" label=""/>
+      <text name="textdefaultcrouchwalk">
+        Standard geduckt Gang:
+      </text>
+      <combo_box name="cwalks" label=""/>
+      <text name="textdefaultfall">
+        Standard fallen:
+      </text>
+      <combo_box name="falls" label=""/>
+      <text name="textdefaulthover">
+        Standard scheweben:
+      </text>
+      <combo_box name="hovers" label=""/>
+      <text name="textdefaultfly">
+        Standard fliegen:
+      </text>
+      <combo_box name="flys" label=""/>
+      <text name="textdefaultflyslow">
+        Standard langsam fliegen:
+      </text>
+      <combo_box name="flyslows" label=""/>
+      <text name="textdefaultflyup">
+        Standard aufwärts fliegen:
+      </text>
+      <combo_box name="flyups" label=""/>
+      <text name="textdefaultflydown">
+        Standard abwärts fliegen:
+      </text>
+      <combo_box name="flydowns" label=""/>
+      <text name="textdefaultland">
+        Standard landen:
+      </text>
+      <combo_box name="lands" label=""/>
+      <text name="textdefaultstandup">
+        Standard aufstehen:
+      </text>
+      <combo_box name="standups" label=""/>
+      <text name="textdefaultprejump">
+        Standard Pre-Sprung:
+      </text>
+      <combo_box name="prejumps" label=""/>
+  </panel>
+</tab_container>
+</floater>
\ No newline at end of file
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
new file mode 100644
index 0000000..8210b1b
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+        name="geminifloater"
+  rect_control="EmeraldAORect"
+        title="Animation Overrider"
+        can_resize="false"
+        can_minimize="true"
+        can_close="true"
+        can_drag_on_left="false"
+        width="610"
+        height="380">
+
+  <view_border blevel_style="in" border_thickness="0" bottom="-380" follows="left|top" height="380" left="1"
+       mouse_opaque="false" name="ao_notecard" width="610" />
+  <view_border blevel_style="in" bottom="340" follows="left|top" height="16" left="10"
+       mouse_opaque="false" name="ao_notecard_vis" width="180" />
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
+       mouse_opaque="true" name="Give inventory"
+       tool_tip="Drop a ZHAO notecard here. Animations have to be in the same Inventory folder as the notecard." v_pad="2"
+       width="180">
+    Drop a ZHAO II Notecard here.
+  </text>
+  <view_border blevel_style="in" bottom_delta="-18" follows="left|top" height="16" left_delta="0"
+       mouse_opaque="false" name="ao_notecard_disp" width="180" />
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
+       mouse_opaque="true" name="ao_nc_text"
+       tool_tip="" v_pad="2"
+       width="180">
+    Currently set to: ITEM
+  </text>
+
+  <button
+      name="opencard"
+      label="Open"
+      font="SansSerifSmall"
+      left="10"
+      bottom_delta="-30"
+      width="58"
+      height="20"
+      follows="bottom|left"
+                />
+  <button
+      name="reloadcard"
+      label="Reload"
+      font="SansSerifSmall"
+      left="70"
+      bottom_delta="0"
+      width="58"
+      height="20"
+      follows="bottom|left"
+                />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+             height="20" label="More &gt;&gt;" left="130"
+             mouse_opaque="true" name="more_btn" scale_image="TRUE"
+             tool_tip="Advanced Options" width="58" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+             height="20" label="&lt;&lt; Less" left_delta="0"
+             mouse_opaque="true" name="less_btn" scale_image="TRUE"
+             tool_tip="Advanced Options" width="58" />
+
+  
+  <check_box bottom_delta="-42" control_name="EmeraldAOEnabled" enabled="true"
+         follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Override Anims" left="10"
+         mouse_opaque="true" name="EmeraldAOEnabled" radio_style="false" width="90" />
+  <check_box bottom_delta="0" control_name="EmeraldAOSitsEnabled" enabled="true"
+         follows="left|top" font="SansSerifSmall" height="16" initial_value="true" label="Override Sits" left="110"
+         mouse_opaque="true" name="EmeraldAOSitsEnabled" radio_style="false" width="90" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+             mouse_opaque="true" name="buttons_desc" v_pad="0" width="180">
+    Stands:
+  </text>
+  <combo_box name="stands" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="-20"/>
+  <button
+    name="prevstand"
+    tool_tip="previous stand"
+    label="&lt;&lt;"
+    font="SansSerifSmall"
+    left="10"
+    bottom_delta="-25"
+    width="90"
+    height="20"
+    follows="bottom|left"
+                />
+  <button
+  name="nextstand"
+  tool_tip="next stand"
+  label="&gt;&gt;"
+  font="SansSerifSmall"
+  left="100"
+  bottom_delta="0"
+  width="90"
+  height="20"
+  follows="bottom|left"
+                />
+  <check_box bottom_delta="-20" control_name="EmeraldAOStandRandomize" enabled="true"
+ follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Randomize Stand Order" left="10"
+ mouse_opaque="true" name="EmeraldAOStandRandomize" radio_style="false" width="200" />
+  <check_box bottom_delta="-20" control_name="EmeraldAONoStandsInMouselook" enabled="true"
+         follows="left|top" font="SansSerifSmall" height="16" initial_value="true" label="Disable Stands in Mouselook" left="10"
+         mouse_opaque="true" name="EmeraldAONoStandsInMouselook" radio_style="false" width="180" />
+  <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16" control_name="EmeraldAOStandInterval"
+         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" />
+
+  <tab_container label="Default" bottom="6" left="210" mouse_opaque="false" name="tabcontainer" tab_min_width="50" tab_position="top" width="390" height="350" bg_opaque_color="0,0,0,0.0">
+    <panel border="true" left="0" bottom="0" follows="left|top|right|bottom" height="350" label="Default Anims" mouse_opaque="true" name="tabdefaultanims" width="390">
+    
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                 mouse_opaque="true" name="textdefaultwalk" v_pad="0" width="180">
+        Default Walk:
+      </text>
+      <combo_box name="walks" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="EmeraldAODefaultWalk" />
+
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                 mouse_opaque="true" name="textdefaultrun" v_pad="0" width="180">
+        Default Run:
+      </text>
+      <combo_box name="runs" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="EmeraldAODefaultRun" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                 mouse_opaque="true" name="textdefaultjump" v_pad="0" width="180">
+        Default Jump:
+      </text>
+      <combo_box name="jumps" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="EmeraldAODefaultJump" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+         font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+         mouse_opaque="true" name="textdefaultsit" v_pad="0" width="180">
+        Default Sit:
+      </text>
+      <combo_box name="sits" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="EmeraldAODefaultSit" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                 mouse_opaque="true" name="textdefaultgsit" v_pad="0" width="180">
+        Default Groundsit:
+      </text>
+      <combo_box name="gsits" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="EmeraldAODefaultGroundSit" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                 mouse_opaque="true" name="textdefaultcrouch" v_pad="0" width="180">
+        Default Crouch:
+      </text>
+      <combo_box name="crouchs" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="EmeraldAODefaultCrouch" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                 mouse_opaque="true" name="textdefaultcrouchwalk" v_pad="0" width="180">
+        Default Crouchwalk:
+      </text>
+      <combo_box name="cwalks" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="EmeraldAODefaultCrouchWalk" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                 mouse_opaque="true" name="textdefaultfall" v_pad="0" width="180">
+        Default Fall:
+      </text>
+      <combo_box name="falls" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="EmeraldAODefaultFall" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="280" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
+                 mouse_opaque="true" name="textdefaulthover" v_pad="0" width="180">
+        Default Hover:
+      </text>
+      <combo_box name="hovers" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="EmeraldAODefaultHover" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
+                 mouse_opaque="true" name="textdefaultfly" v_pad="0" width="180">
+        Default Fly:
+      </text>
+      <combo_box name="flys" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="EmeraldAODefaultFly" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
+                 mouse_opaque="true" name="textdefaultflyslow" v_pad="0" width="180">
+        Default Slow Fly:
+      </text>
+      <combo_box name="flyslows" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="EmeraldAODefaultFlySlow" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
+                 mouse_opaque="true" name="textdefaultflyup" v_pad="0" width="180">
+        Default Upward Fly:
+      </text>
+      <combo_box name="flyups" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="EmeraldAODefaultFlyUp" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
+                 mouse_opaque="true" name="textdefaultflydown" v_pad="0" width="180">
+        Default Downward Fly:
+      </text>
+      <combo_box name="flydowns" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="EmeraldAODefaultFlyDown" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
+                 mouse_opaque="true" name="textdefaultland" v_pad="0" width="180">
+        Default Land:
+      </text>
+      <combo_box name="lands" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="EmeraldAODefaultLand" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
+                 mouse_opaque="true" name="textdefaultstandup" v_pad="0" width="180">
+        Default Standup:
+      </text>
+      <combo_box name="standups" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="EmeraldAODefaultStandUp" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
+                 mouse_opaque="true" name="textdefaultprejump" v_pad="0" width="180">
+        Default Pre-Jump:
+      </text>
+      <combo_box name="prejumps" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="EmeraldAODefaultPreJump" />
+  </panel>
+</tab_container>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 9c02f07..8f213c8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -346,6 +346,11 @@
       <on_check control="ShowMiniMap" />
     </menu_item_check>
     <menu_item_separator />
+    <menu_item_check label="AO" name="AO" 
+                     shortcut="control|shift|O">
+      <on_click function="View.AO" userdata="" />
+    </menu_item_check>
+    <menu_item_separator />
     <menu_item_check name="Statistics Bar" label="Statistics Bar"
                      shortcut="control|shift|1">
       <on_click function="ShowFloater" userdata="stat bar" />