3 files changed, 122 insertions, 0 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
new file mode 100644
index 0000000..be7de86
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+        name="animation list"
+        title="Animation List"
+        can_resize="true"
+        can_minimize="true"
+        can_close="true"
+        can_drag_on_left="false"
+    rect_control="FloaterAnimationListRect"
+        min_width="1000"
+        min_height="275"
+        >
+        <scroll_list
+                    name="animation_list"
+                    left="10"
+                    right="-10"
+                    top="-20"
+                    bottom="100"
+                    column_padding="0"
+                    can_resize="true"
+                    follows="left|top|bottom|right"
+                    draw_heading="true"
+                    multi_select="true"
+                    search_column="1"
+                    tool_tip="Hold shift or control while clicking to select multiple thingers"
+                    >
+                <!-- Icons relating to the avatar, currently: tracking, and marked -->
+                <column name="Anim Name" label="Anim Name" width="250"/>
+    <column name="Animation UUID" label="Animation UUID" width="250"/>
+    <!--<column name="object_name" label="Distance" dynamicwidth="true"/>-->
+                <column name="Source Object UUID" label="Source Object UUID" width="250"/>
+    <column name="Source Owner" label="Source Owner" width="250"/>
+    <!-- What the avatar is doing: producing sounds, rezzing, particles, etc -->
+        </scroll_list>
+        <panel 
+               name="options"
+               left="10"
+               right="-10"
+         top="90"       
+               bottom="10"      
+               border="true"
+               mouse_opaque="true"
+               bevel_style="in"
+               background_visible="true"
+               background_opaque="true"
+               follows="left|right|bottom"
+               bg_opaque_color="0,0,0,0.3"
+               bg_alpha_color="blue"
+               can_resize="false"
+        >
+        </panel>
+
+  <button bottom="55" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Stop Selected" left_delta="5"
+       mouse_opaque="true" name="Stop Selected"
+       tool_tip="Stop selected animations" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Revoke Selected" left_delta="155"
+       mouse_opaque="true" name="Revoke Selected"
+       tool_tip="Revokes animation permissions for object associated with the selections" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Stop+Revoke Selected" left_delta="155"
+       mouse_opaque="true" name="Stop+Revoke Selected"
+       tool_tip="Revokes animation permissions for object(s) associated with the selections, as well as stopping the anim" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Open Owner Profile" left_delta="155"
+       mouse_opaque="true" name="Open Owner Profile"
+       tool_tip="Opens profile of the owner(s) of object(s) associated with the selections" width="150" />
+  <button bottom_delta="-25" enabled="false" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Return Object" left_delta="-465"
+       mouse_opaque="true" name="Return Object"
+       tool_tip="Returns object(s) selected, if you have land powers" width="150" />
+
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
new file mode 100644
index 0000000..13c6b6c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" enabled="true" follows="left|bottom" height="620"
+     hidden="false" left="300" min_height="420" min_width="630"
+     mouse_opaque="true" name="asset browser" title="Asset Browser" width="720">
+        
+        <inventory_panel allow_multi_select="false" border="true" bottom="-299" enabled="true"
+             follows="left|top" height="280" hidden="false" left="10"
+             mouse_opaque="true" name="inventory panel"
+             sort_order="TexturePickerSortOrder" width="231"/>
+
+        <button bottom="-350" follows="left|top" font="SansSerifSmall"
+                halign="center" height="20" hidden="false" label="Next &gt;&gt;"
+                left="160" mouse_opaque="true" name="button next" scale_image="TRUE"
+                width="80"/>
+                
+        <button bottom_delta="-30" follows="left|top" font="SansSerifSmall" 
+                halign="center" height="20" hidden="false" label="&lt;&lt; Previous"
+                left_delta="0" mouse_opaque="true" name="button previous" scale_image="TRUE"
+                width="80"/>
+                
+        <button bottom_delta="-30" follows="left|top" font="SansSerifSmall" 
+                halign="center" height="20" hidden="false" label="Refresh"
+                left_delta="0" mouse_opaque="true" name="button refresh" scale_image="TRUE"
+                width="80"/>
+                
+</floater>
+
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 f837029..a53e339 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
@@ -884,6 +884,25 @@
                 userdata="QuietSnapshotsToDisk" />
       <on_check control="QuietSnapshotsToDisk" />
     </menu_item_check>
+    <menu_item_call label="Ground Sit" name="Ground Sit" 
+                    shortcut="control|alt|s">
+      <on_click function="Advanced.ToggleSit" userdata="" />
+      <on_Check function="Advanced.CheckSit" userdata="" />
+    </menu_item_call>
+    <menu_item_check label="Phantom Avatar" name="Phantom" 
+                     shortcut="control|alt|p">
+      <on_click function="Advanced.TogglePhantom" userdata="" />
+      <on_check function="Advanced.CheckPhantom" userdata="" />
+    </menu_item_check>
+    <menu_item_check label="Animation List" name="Animation List">
+      <on_click function="ShowFloater" userdata="animation list" />
+      <on_check function="FloaterVisible" userdata="animation list" />
+    </menu_item_check>
+    <menu_item_check label="Asset Browser" name="asset browser" 
+                     shortcut="alt|shift|a">
+      <on_click function="Advanced.ToggleAssetBrowser" userdata="" />
+      <on_check function="Advanced.CheckAssetBrowser" userdata="" />
+    </menu_item_check>
     <menu_item_check name="Show Mouselook Crosshairs"
                      label="Show Mouselook Crosshairs">
       <on_click function="ToggleControl"