11 files changed, 370 insertions, 35 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index cafe004..3b229c0 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1179,6 +1179,11 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/floater_windlight_options.xml
     skins/default/xui/en-us/floater_world_map.xml
     skins/default/xui/en-us/fonts.xml
+    skins/default/xui/en-us/legacy_menu_pie_attachment.xml
+        skins/default/xui/en-us/legacy_menu_pie_avatar.xml
+        skins/default/xui/en-us/legacy_menu_pie_land.xml
+        skins/default/xui/en-us/legacy_menu_pie_object.xml
+        skins/default/xui/en-us/legacy_menu_pie_self.xml
     skins/default/xui/en-us/menu_inventory.xml
     skins/default/xui/en-us/menu_login.xml
     skins/default/xui/en-us/menu_mini_map.xml
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 12d052c..f928e28 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5580,6 +5580,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LegacyPieEnabled</key>
+    <map>
+      <key>Comment</key>
+      <string>Use legacy pie menu</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>LimitDragDistance</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index adb4cfc..5664f03 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -44,6 +44,7 @@
 
 #include "llagent.h"
 #include "llviewerregion.h"
+#include "llviewermenu.h"
 
 LLPanelGeneral::LLPanelGeneral()
 {
@@ -105,6 +106,8 @@ BOOL LLPanelGeneral::postBuild()
         
         childSetVisible("maturity_desired_combobox", can_choose);
         childSetVisible("maturity_desired_textbox",     !can_choose);
+
+        childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
                         
         return TRUE;
 }
@@ -155,6 +158,12 @@ void LLPanelGeneral::apply()
                         gAgent.sendMaturityPreferenceToServer(preferred_maturity);
                 }
         }
+
+        if (gSavedSettings.getBOOL("LegacyPieEnabled") == !((BOOL)childGetValue("legacy_pie_menu_checkbox")))
+        {
+                gSavedSettings.setBOOL("LegacyPieEnabled", childGetValue("legacy_pie_menu_checkbox"));
+                build_pie_menus();
+        }
 }
 
 void LLPanelGeneral::cancel()
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 34e7c77..c403700 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -618,24 +618,7 @@ void init_menus()
         ///
         /// Pie menus
         ///
-        gPieSelf = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_self.xml", gMenuHolder);
-
-        // TomY TODO: what shall we do about these?
-        gDetachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach HUD", true);
-        gDetachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach", true);
-
-        gPieAvatar = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_avatar.xml", gMenuHolder);
-
-        gPieObject = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_object.xml", gMenuHolder);
-
-        gAttachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach HUD");
-        gAttachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach");
-
-        gPieAttachment = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_attachment.xml", gMenuHolder);
-
-        gPieHUD = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_hud.xml", gMenuHolder);
-
-        gPieLand = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_land.xml", gMenuHolder);
+        build_pie_menus();
 
         ///
         /// set up the colors
@@ -5164,6 +5147,35 @@ void toggle_debug_menus(void*)
 }
 
 
+void build_pie_menus()
+{
+        // build legacy pie menus (based on SL viewer 1.22)
+        if (gSavedSettings.getBOOL("LegacyPieEnabled"))
+        {
+                gPieSelf = LLUICtrlFactory::getInstance()->buildPieMenu("legacy_menu_pie_self.xml", gMenuHolder);
+                gPieAvatar = LLUICtrlFactory::getInstance()->buildPieMenu("legacy_menu_pie_avatar.xml", gMenuHolder);
+                gPieAttachment = LLUICtrlFactory::getInstance()->buildPieMenu("legacy_menu_pie_attachment.xml", gMenuHolder);
+                gPieLand = LLUICtrlFactory::getInstance()->buildPieMenu("legacy_menu_pie_land.xml", gMenuHolder);
+                gPieObject = LLUICtrlFactory::getInstance()->buildPieMenu("legacy_menu_pie_object.xml", gMenuHolder);
+        }
+        else
+        {
+                gPieSelf = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_self.xml", gMenuHolder);
+                gPieAvatar = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_avatar.xml", gMenuHolder);
+                gPieAttachment = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_attachment.xml", gMenuHolder);
+                gPieLand = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_land.xml", gMenuHolder);
+                gPieObject = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_object.xml", gMenuHolder);
+        }
+
+        // TomY TODO: what shall we do about these?
+        gDetachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach HUD", true);
+        gDetachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach", true);
+        gAttachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach HUD");
+        gAttachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach");
+
+        gPieHUD = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_hud.xml", gMenuHolder);
+}
+
 // LLUUID gExporterRequestID;
 // std::string gExportDirectory;
 
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index 26c65fb..560edc8 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -49,6 +49,8 @@ void init_menus();
 void cleanup_menus();
 
 void show_debug_menus(); // checks for if menus should be shown first.
+// builds either current or legacy pie menus depending upon LegacyPieEnabled
+void build_pie_menus();
 void show_context_menu( S32 x, S32 y, MASK mask );
 void show_build_mode_context_menu(S32 x, S32 y, MASK mask);
 BOOL enable_save_into_inventory(void*);
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
new file mode 100644
index 0000000..18bedd0
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Attachment Pie">
+        <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
+                <on_click function="Attachment.Drop" />
+                <on_enable function="Attachment.EnableDrop" />
+        </menu_item_call>
+        <menu_item_separator />
+        <menu_item_separator />
+        <menu_item_separator />
+        <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
+                <on_click function="Object.Inspect" />
+                <on_enable function="Object.EnableInspect" />
+        </menu_item_call>
+        <menu_item_separator />
+        <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
+                <on_click function="Attachment.Detach" />
+                <on_enable function="Attachment.EnableDetach" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit">
+                <on_click function="Object.Edit" />
+                <on_enable function="EnableEdit" />
+        </menu_item_call>
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml
new file mode 100644
index 0000000..7fba0be
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Avatar Pie">
+        <menu_item_call enabled="false" label="Profile..." mouse_opaque="true" name="Profile...">
+                <on_click function="ShowAgentProfile" userdata="hit object" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Avatar Mute">
+                <on_click function="Avatar.Mute" />
+                <on_enable function="Avatar.EnableMute" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Go To" mouse_opaque="true" name="Go To">
+                <on_click function="GoToObject" />
+        </menu_item_call>
+        <menu_item_separator />
+        <menu_item_call enabled="false" label="Add Friend..." mouse_opaque="true" name="Add Friend">
+                <on_click function="Avatar.AddFriend" />
+                <on_enable function="Avatar.EnableAddFriend" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay...">
+                <on_click function="PayObject" />
+                <on_enable function="EnablePayObject" />
+        </menu_item_call>
+        <pie_menu label="More &gt;" name="More &gt;">
+                <menu_item_call enabled="false" label="Freeze..." mouse_opaque="true" name="Freeze...">
+                        <on_click function="Avatar.Freeze" />
+                        <on_enable function="Avatar.EnableFreezeEject" />
+                </menu_item_call>
+                <menu_item_call enabled="false" label="Give Card" mouse_opaque="true" name="Give Card">
+                        <on_click function="Avatar.GiveCard" />
+                </menu_item_call>
+                <menu_item_call enabled="true" label="Group Invite..." mouse_opaque="true" name="Invite...">
+                        <on_click function="Avatar.InviteToGroup" />
+                </menu_item_call>
+                <menu_item_call enabled="true" label="Report..." mouse_opaque="true" name="abuse">
+                        <on_click function="Avatar.ReportAbuse" />
+                </menu_item_call>
+                <menu_item_call enabled="false" label="Eject..." mouse_opaque="true" name="Eject...">
+                        <on_click function="Avatar.Eject" />
+                        <on_enable function="Avatar.EnableFreezeEject" />
+                </menu_item_call>
+                <menu_item_call enabled="false" label="Debug..." mouse_opaque="true" name="Debug...">
+                        <on_click function="Avatar.Debug" />
+                        <on_visible function="Avatar.VisibleDebug" />
+                        <on_enable function="Avatar.EnableDebug" />
+                </menu_item_call>
+                <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Avatar Inspect">
+                        <on_click function="Object.Inspect" />
+                        <on_enable function="Object.EnableInspect" />
+                </menu_item_call>
+        </pie_menu>
+        <menu_item_call enabled="false" label="Send IM..." mouse_opaque="true" name="Send IM...">
+                <on_click function="Avatar.SendIM" />
+        </menu_item_call>
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_land.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_land.xml
new file mode 100644
index 0000000..05827c5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_land.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Land Pie">
+        <menu_item_call enabled="false" label="About Land..." mouse_opaque="true" name="About Land...">
+                <on_click function="ShowFloater" userdata="about land" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
+                <on_click function="Land.Build" />
+                <on_enable function="EnableEdit" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Go Here" mouse_opaque="true" name="Go Here">
+                <on_click function="GoToObject" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Sit Here">
+                <on_click function="Land.Sit" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Landmark..." mouse_opaque="true" name="Add Landmark">
+                <on_click function="Land.NewLandmark" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Buy Pass..." mouse_opaque="true" name="Land Buy Pass">
+                <on_click function="Land.BuyPass" />
+                <on_enable function="Land.EnableBuyPass" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Edit Terrain" mouse_opaque="true" name="Edit Terrain">
+                <on_click function="Land.Edit" />
+                <on_enable function="EnableEdit" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Buy Land..." mouse_opaque="true" name="Land Buy">
+                <on_click function="ShowFloater" userdata="buy land" />
+                <on_enable function="World.EnableBuyLand" />
+        </menu_item_call>
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml
new file mode 100644
index 0000000..3703dbd
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Object Pie">
+        <menu_item_call enabled="false" label="Open" mouse_opaque="true" name="Open">
+                <on_click function="Object.Open" />
+                <on_enable function="Object.EnableOpen" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
+                <on_click function="Object.Build" />
+                <on_enable function="EnableEdit" />
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
+                <on_click function="Object.Touch" />
+                <on_enable function="Object.EnableTouch" userdata="Touch" name="EnableTouch"/>
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Object Sit">
+                <on_click function="Object.SitOrStand" />
+                <on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" name="EnableSitOrStand"/>
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Take" mouse_opaque="true" name="Pie Object Take">
+                <on_click function="Tools.Take" />
+                <on_enable function="Tools.EnableTake" name="EnableTake"/>
+        </menu_item_call>
+        <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay...">
+                <on_click function="PayObject" />
+                <on_enable function="EnablePayObject" />
+        </menu_item_call>
+        <pie_menu label="More &gt;" name="More &gt;">
+                <menu_item_call enabled="false" label="Delete" mouse_opaque="true" name="Delete">
+                        <on_click function="Object.Delete" />
+                        <on_enable function="Object.EnableDelete" />
+                </menu_item_call>
+                <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
+                        <on_click function="Object.AttachToAvatar" />
+                        <on_enable function="Object.EnableWear" />
+                </menu_item_call>
+                <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
+                        <on_click function="Tools.TakeCopy" />
+                        <on_enable function="Tools.EnableTakeCopy" />
+                </menu_item_call>
+                <pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
+                <pie_menu label="Attach &gt;" name="Object Attach" />
+                <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
+                        <on_click function="Object.Return" />
+                        <on_enable function="Object.EnableReturn" />
+                </menu_item_call>
+                <pie_menu label="More &gt;" name="Rate Menu">
+                        <menu_item_call label="Export" enabled="false" hidden="false"
+                                mouse_opaqu="true" name="Export">
+                                <on_click function="Object.Export" />
+                        <on_enable function="Object.EnableExport" />
+                        </menu_item_call>
+                        <menu_item_call name="Link" enabled="false" label="Link">
+                                <on_click function="Tools.Link" userdata="" />
+                                <on_enable function="Tools.EnableLink" />
+                         </menu_item_call>
+                        <menu_item_call enabled="false" label="Report Abuse..." mouse_opaque="true"
+                             name="Report Abuse...">
+                                <on_click function="Object.ReportAbuse" />
+                                <on_enable function="Object.EnableReportAbuse" />
+                        </menu_item_call>
+                        <menu_item_call enabled="false" label="Go Here" mouse_opaque="true" name="Go Here">
+                                <on_click function="GoToObject" />
+                        </menu_item_call>
+                        <menu_item_call name="Unlink" enabled="false" label="Unlink">
+                                <on_click function="Tools.Unlink" userdata="" />
+                                <on_enable function="Tools.EnableUnlink" />
+                        </menu_item_call>
+                        <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
+                                <on_click function="Object.Mute" />
+                                <on_enable function="Object.EnableMute" />
+                        </menu_item_call>
+                        <menu_item_separator />
+                        <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
+                                <on_click function="Object.Inspect" />
+                                <on_enable function="Object.EnableInspect" />
+                        </menu_item_call>
+                </pie_menu>
+                <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
+                        <on_click function="Object.Buy" />
+                        <on_enable function="Object.EnableBuy" />
+                </menu_item_call>
+        </pie_menu>
+        <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
+                <on_click function="Object.Edit" />
+                <on_enable function="EnableEdit" />
+        </menu_item_call>
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_self.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_self.xml
new file mode 100644
index 0000000..1e7e08a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_self.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Self Pie">
+        <menu_item_call enabled="true" label="Profile..." name="Profile...">
+                <on_click function="ShowAgentProfile" userdata="agent" />
+        </menu_item_call>
+        <menu_item_call enabled="true" label="Groups..." name="Groups...">
+                <on_click function="ShowAgentGroups" userdata="agent" />
+        </menu_item_call>
+        <menu_item_call enabled="true" label="Inventory" name="Inventory">
+                <on_click function="ShowFloater" userdata="inventory" />
+        </menu_item_call>
+        <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
+                <on_click function="Self.StandUp" userdata="" />
+                <on_enable function="Self.EnableStandUp" />
+        </menu_item_call>
+        <menu_item_call enabled="true" label="Friends..." name="Friends...">
+                <on_click function="ShowFloater" userdata="friends" />
+        </menu_item_call>
+        <menu_item_call enabled="true" label="Gestures..." name="Gestures...">
+                <on_click function="ShowFloater" userdata="gestures" />
+        </menu_item_call>
+        <pie_menu enabled="true" label="Take Off &gt;" name="Take Off &gt;">
+                <pie_menu enabled="true" label="Clothes &gt;" name="Clothes &gt;">
+                        <menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
+                             mouse_opaque="true" name="Shirt" width="118">
+                                <on_click function="Edit.TakeOff" userdata="shirt" />
+                                <on_enable function="Edit.EnableTakeOff" userdata="shirt" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0"
+                             mouse_opaque="true" name="Pants" width="118">
+                                <on_click function="Edit.TakeOff" userdata="pants" />
+                                <on_enable function="Edit.EnableTakeOff" userdata="pants" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0"
+                             mouse_opaque="true" name="Shoes" width="118">
+                                <on_click function="Edit.TakeOff" userdata="shoes" />
+                                <on_enable function="Edit.EnableTakeOff" userdata="shoes" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0"
+                             mouse_opaque="true" name="Socks" width="118">
+                                <on_click function="Edit.TakeOff" userdata="socks" />
+                                <on_enable function="Edit.EnableTakeOff" userdata="socks" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0"
+                             mouse_opaque="true" name="Jacket" width="118">
+                                <on_click function="Edit.TakeOff" userdata="jacket" />
+                                <on_enable function="Edit.EnableTakeOff" userdata="jacket" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0"
+                             mouse_opaque="true" name="Gloves" width="118">
+                                <on_click function="Edit.TakeOff" userdata="gloves" />
+                                <on_enable function="Edit.EnableTakeOff" userdata="gloves" />
+                        </menu_item_call>
+                        <pie_menu enabled="true" label="More &gt;" name="More &gt;">
+                                <menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0"
+                                     mouse_opaque="true" name="Self Undershirt" width="118">
+                                        <on_click function="Edit.TakeOff" userdata="undershirt" />
+                                        <on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
+                                </menu_item_call>
+                                <menu_item_separator />
+                                <menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0"
+                                     mouse_opaque="true" name="All Clothes" width="118">
+                                        <on_click function="Edit.TakeOff" userdata="all" />
+                                </menu_item_call>
+                                <menu_item_separator />
+                                <menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0"
+                                     mouse_opaque="true" name="Self Underpants" width="118">
+                                        <on_click function="Edit.TakeOff" userdata="underpants" />
+                                        <on_enable function="Edit.EnableTakeOff" userdata="underpants" />
+                                </menu_item_call>
+                        </pie_menu>
+                        <menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0"
+                             mouse_opaque="true" name="Skirt" width="118">
+                                <on_click function="Edit.TakeOff" userdata="skirt" />
+                                <on_enable function="Edit.EnableTakeOff" userdata="skirt" />
+                        </menu_item_call>
+                </pie_menu>
+                <menu_item_separator />
+                <pie_menu enabled="true" label="HUD &gt;" name="Object Detach HUD" />
+                <menu_item_separator />
+                <pie_menu enabled="true" label="Detach &gt;" name="Object Detach" />
+                <menu_item_separator />
+                <menu_item_call enabled="true" label="Detach All" name="Detach All">
+                        <on_click function="Self.RemoveAllAttachments" userdata="" />
+                        <on_enable function="Self.EnableRemoveAllAttachments" />
+                </menu_item_call>
+        </pie_menu>
+        <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
+                <on_click function="ShowFloater" userdata="appearance" />
+                <on_enable function="Edit.EnableCustomizeAvatar" />
+        </menu_item_call>
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 6b17ab3..dba8007 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -29,11 +29,11 @@
                         Always
                 </combo_item>
         </combo_box>
-        <check_box bottom_delta="-25" follows="left|top"
+        <check_box bottom_delta="0" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="true"
-             label="Small Avatar Names" left="151" name="small_avatar_names_checkbox"
+             label="Small Avatar Names" left="330" name="small_avatar_names_checkbox"
              width="200" />
-        <check_box bottom_delta="-18" follows="left|top"
+        <check_box bottom_delta="-20" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Hide My Name On My Screen" left="151" name="show_my_name_checkbox"
              width="200" />
@@ -50,18 +50,28 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Hide My Group Title" left="151" name="show_my_title_checkbox"
              radio_style="false" width="256" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
+  <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
+       halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
+       width="394">
+      Pie Menus:
+  </text>
+  <check_box bottom_delta="0" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       label="Use legacy pie menus" left="151"
+       mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
+       width="256" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
              can_apply_immediately="false" color="1 1 1 1"
              enabled="true" follows="left|top" height="48" label="" left="153"
              mouse_opaque="true" name="effect_color_swatch"
              tool_tip="Click to open Color Picker" width="32" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
-                UI Size:
-        </text>
-        <slider bottom="-217" can_edit_text="true"
+    UI Size:
+  </text>
+  <slider bottom="-217" can_edit_text="true"
              decimal_digits="3" enabled="true" height="16" increment="0.001"
              initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
              name="ui_scale_slider" show_text="true" value="1" width="220" />
@@ -69,18 +79,18 @@
              font="SansSerif" halign="center" height="22" label="Reset"
              label_selected="Reset" left_delta="226" mouse_opaque="true"
              name="reset_ui_size" scale_image="true" width="80" />
-        <check_box bottom="-236" enabled="true" follows="left|top"
+  <check_box bottom="-236" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Use resolution independent scale" left="151" mouse_opaque="true"
              name="ui_auto_scale" radio_style="false" width="256" />
-        <spinner bottom="-260" decimal_digits="0" enabled="true"
+  <spinner bottom="-260" decimal_digits="0" enabled="true"
              follows="left|top" height="16" increment="1" initial_val="300"
              label="Away Timeout:" label_width="141" left="10" max_val="600"
              min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-     mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
+       bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+       mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
     Mini-map notify:
   </text>
   <check_box bottom_delta="0" enabled="true"
@@ -89,10 +99,10 @@
              mouse_opaque="true" name="mini_map_notify_chat" radio_style="false"
              width="256" />
   <check_box bottom_delta="0" enabled="true"
-     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-     label="Entering sim" left="330"
-     mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
-     width="256" />
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       label="Entering sim" left="330"
+       mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
+       width="256" />
         <check_box bottom="-304" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Notify when Linden dollars (L$) spent or received" left="151"