From c26050a1ec9cb5102df0fc34117ea57f3f407ba5 Mon Sep 17 00:00:00 2001
From: CharleyLevenque <charley.levenque@gmail.com>
Date: Mon, 23 Aug 2010 04:13:03 -0400
Subject: [PATCH] Added in Emerald's 'Derender' option on objects and avatars,
 tidied up avatar, object and self pie menu xml.

---
 indra/newview/llviewermenu.cpp                | 36 +++++++++++++++++++
 .../default/xui/en-us/menu_pie_attachment.xml |  4 +++
 .../default/xui/en-us/menu_pie_avatar.xml     |  7 ++--
 .../default/xui/en-us/menu_pie_object.xml     |  3 ++
 .../skins/default/xui/en-us/menu_pie_self.xml | 28 ++++++++-------
 5 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 4f1fda058..db0eaf79a 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2030,6 +2030,40 @@ class LLObjectInspect : public view_listener_t
 	}
 };
 
+// <dogmode> Derenderizer. Originally by Phox.
+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))
+		// <dogmode> Kill 'em all
+		if (true)
+		{
+			LLViewerObject *objectp = gObjectList.findObject(id);
+			if (objectp)
+			{
+				gObjectList.killObject(objectp);
+			}
+		}
+		return true;
+	}
+};
+
 
 //---------------------------------------------------------------------------
 // Land pie menu
@@ -9629,6 +9663,8 @@ void initialize_menus()
 	addMenu(new LLObjectBuy(), "Object.Buy");
 	addMenu(new LLObjectEdit(), "Object.Edit");
 	addMenu(new LLObjectInspect(), "Object.Inspect");
+	// <dogmode> Visual mute, originally by Phox.
+	addMenu(new LLObjectDerender(), "Object.DERENDER");
 
 	addMenu(new LLObjectEnableOpen(), "Object.EnableOpen");
 	addMenu(new LLObjectEnableTouch(), "Object.EnableTouch");
diff --git a/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml b/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
index cd0cec71e..5aface602 100644
--- a/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
@@ -23,6 +23,10 @@
 		<menu_item_call enabled="false" label="Data" mouse_opaque="true" name="Data">
     		<on_click function="Object.Data" />
 		</menu_item_call>
+    <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+      <on_click function="Object.DERENDER" />
+      <on_enable function="Object.EnableDerender" />
+    </menu_item_call>
 	</pie_menu>
 	<menu_item_call enabled="true" label="Stand Up" name="Stand Up">
 		<on_click function="Self.StandUp" userdata="" />
diff --git a/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml b/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
index 909b133ca..be3c21ac3 100644
--- a/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
@@ -40,10 +40,6 @@
 			<on_click function="Avatar.Debug" />
 		</menu_item_call>
 		<pie_menu label="Tools &gt;" name="Tools &gt;">
-			<menu_item_call enabled="true" label="Safe Client" mouse_opaque="true" name="Safe Client">
-			<on_click function="Avatar.SafeClient" />
-			</menu_item_call>
-			<menu_item_separator />
 			<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
 				<on_click function="Object.ScriptCount" />
 				<on_visible function="Object.VisibleScriptCount" />
@@ -51,6 +47,9 @@
 			<menu_item_call enabled="true" label="Copy UUID" mouse_opaque="true" name="CopyUUID">
 			 <on_click function="Avatar.CopyUUID" />
 			</menu_item_call>
+      <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+        <on_click function="Object.DERENDER" />
+      </menu_item_call>
 		</pie_menu>
 		<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
 			<on_click function="Object.Inspect" />
diff --git a/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index 64f4fd02a..707941556 100644
--- a/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -71,6 +71,9 @@
       </menu_item_call>
       <menu_item_call enabled="true" hidden="false" label="Data" mouse_opaque="true" name="Data">
         <on_click function="Object.Data" />
+      </menu_item_call>
+      <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+        <on_click function="Object.DERENDER" />
       </menu_item_call>
 		</pie_menu>
 		<menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
diff --git a/indra/newview/skins/default/xui/en-us/menu_pie_self.xml b/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
index fc4293429..983e4b31d 100644
--- a/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
@@ -71,15 +71,22 @@
 			<on_enable function="Self.EnableRemoveAllAttachments" />
 		</menu_item_call>
 	</pie_menu>
-	<menu_item_call enabled="true" hidden="false" label="Anims..." mouse_opaque="true"
-						 name="Anims...">
-		<on_click function="Avatar.Anims" />
-	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
-		<on_click function="Object.ScriptCount" />
-		<on_visible function="Object.VisibleScriptCount" />
-	</menu_item_call>
-	<menu_item_separator />
+  <pie_menu label="Tools &gt;" name="Tools &gt;">
+	  <menu_item_call enabled="true" hidden="false" label="Anims..." mouse_opaque="true"
+						   name="Anims...">
+		  <on_click function="Avatar.Anims" />
+	  </menu_item_call>
+	  <menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
+		  <on_click function="Object.ScriptCount" />
+		  <on_visible function="Object.VisibleScriptCount" />
+	  </menu_item_call>
+    <menu_item_call enabled="true" label="Debug..." mouse_opaque="true" name="Debug Layers">
+      <on_click function="Avatar.Debug" />
+    </menu_item_call>
+    <menu_item_call enabled="true" label="Copy UUID" mouse_opaque="true" name="CopyUUID">
+      <on_click function="Avatar.CopyUUID" />
+    </menu_item_call>
+  </pie_menu>
 	<menu_item_call enabled="true" label="Gestures..." name="Gestures...">
 		<on_click function="ShowFloater" userdata="gestures" />
 	</menu_item_call>
@@ -87,7 +94,4 @@
 		<on_click function="ShowFloater" userdata="appearance" />
 		<on_enable function="Edit.EnableCustomizeAvatar" />
 	</menu_item_call>
-	<menu_item_call enabled="true" label="Copy UUID" mouse_opaque="true" name="CopyUUID">
-		 <on_click function="Avatar.CopyUUID" />
-	</menu_item_call>
 </pie_menu>