Object->Derender from Object UIs

Shyotl · Feb 28, 2020 · 9412f63 · 9412f63
1 parent be07df3
commit 9412f63
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
@@ -9893,6 +9893,21 @@ class ListObjectCanEdit : public view_listener_t
 	}
 };
 
+class ListObjectDerender final : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) override
+	{
+		const std::string& unknown = LLTrans::getString("land_type_unknown");
+		for (const auto& id : LFIDBearer::getActiveSelectedIDs())
+		{
+			const auto& obj_data = get_obj_data(id); // Needed for object name
+			add_object_to_blacklist(id, obj_data ? obj_data->name : unknown);
+		}
+
+		return true;
+	}
+};
+
 class MediaCtrlCopyURL : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -10295,6 +10310,7 @@ void initialize_menus()
 	addMenu(new ListObjectEnableTouch, "List.Object.EnableTouch");
 	addMenu(new ListObjectEdit, "List.Object.Edit");
 	addMenu(new ListObjectCanEdit, "List.Object.CanEdit");
+	addMenu(new ListObjectDerender, "List.Object.Derender");
 	addMenu(new ListExperienceAllow, "List.Experience.Allow");
 	addMenu(new ListExperienceForget, "List.Experience.Forget");
 	addMenu(new ListExperienceBlock, "List.Experience.Block");

diff --git a/indra/newview/skins/default/xui/en-us/menu_objects_list.xml b/indra/newview/skins/default/xui/en-us/menu_objects_list.xml
@@ -37,6 +37,10 @@
     <on_visible function="List.Object.CanEdit" userdata=""/>
   </menu_item_call>
   <menu_item_separator/>
+  <menu_item_call label="Derender" name="Derender">
+    <on_click function="List.Object.Derender"/>
+  </menu_item_call>
+  <menu_item_separator/>
   <menu_item_call label="Copy Key" name="Copy Key">
     <on_click function="List.CopyUUIDs"/>
     <on_visible function="List.EnableAnySelected"/>

diff --git a/indra/newview/skins/default/xui/en-us/menu_url_objectim.xml b/indra/newview/skins/default/xui/en-us/menu_url_objectim.xml
@@ -76,6 +76,10 @@
       <on_click function="List.Object.Edit" userdata=""/>
       <on_visible function="List.Object.CanEdit" userdata=""/>
     </menu_item_call>
+    <menu_item_separator/>
+    <menu_item_call label="Derender" name="Derender">
+      <on_click function="List.Object.Derender"/>
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call