Port "Derender" pie option from Emerald. All credit due to the Emerald team.

3 files changed, 38 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 9e2cc3d..7f45751 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2055,6 +2055,37 @@ class LLObjectInspect : public view_listener_t
         }
 };
 
+class LLObjectDerender : public view_listener_t
+{
+    bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+    {
+                LLViewerObject* slct = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                if(!slct)return true;
+                LLUUID id = slct->getID();
+                LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
+                LLUUID root_key;
+                LLSelectNode* node = selection->getFirstRootNode();
+                if(node)root_key = node->getObject()->getID();
+                if(root_key.notNull())
+                {
+                        id = root_key;
+                        //LLSelectMgr::getInstance()->removeObjectFromSelections(root_key);
+                }
+                LLSelectMgr::getInstance()->removeObjectFromSelections(id);
+
+                // ...don't kill the avatar
+                if (!(id == gAgentID))
+                {
+                        LLViewerObject *objectp = gObjectList.findObject(id);
+                        if (objectp)
+                        {
+                                gObjectList.killObject(objectp);
+                        }
+                }
+                return true;
+        }
+};
+
 
 //---------------------------------------------------------------------------
 // Land pie menu
@@ -11056,6 +11087,7 @@ void initialize_menus()
         addMenu(new LLObjectBuy(), "Object.Buy");
         addMenu(new LLObjectEdit(), "Object.Edit");
         addMenu(new LLObjectInspect(), "Object.Inspect");
+        addMenu(new LLObjectDerender(), "Object.DERENDER");
         addMenu(new LLObjectCopyUUID(), "Object.CopyUUID");
         addMenu(new LLObjectExport(), "Object.Export");
         addMenu(new LLObjectImport(), "Object.Import");
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
index ead21cd..065c2e7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
@@ -41,6 +41,9 @@
       <on_enable function="Object.EnableInspect" />
     </menu_item_call>
     <menu_item_separator />
+    <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+      <on_click function="Object.DERENDER" />
+    </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" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index 169d0b9..1d3ccf6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -54,6 +54,9 @@
         <on_click function="Object.Mute" />
         <on_enable function="Object.EnableMute" />
       </menu_item_call>
+      <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+        <on_click function="Object.DERENDER" />
+      </menu_item_call>
       <menu_item_call enabled="false" label="Report..." mouse_opaque="true"
                              name="Report Abuse...">
         <on_click function="Object.ReportAbuse" />