Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Object->Derender from Object UIs

Browse Source
This commit is contained in:
Liru Færs
2020-02-28 01:31:34 -05:00
parent be07df3043
commit 9412f631fa
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llviewermenu.cpp
View File

@@ -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 class MediaCtrlCopyURL : public view_listener_t
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -10295,6 +10310,7 @@ void initialize_menus()
addMenu(new ListObjectEnableTouch, "List.Object.EnableTouch"); addMenu(new ListObjectEnableTouch, "List.Object.EnableTouch");
addMenu(new ListObjectEdit, "List.Object.Edit"); addMenu(new ListObjectEdit, "List.Object.Edit");
addMenu(new ListObjectCanEdit, "List.Object.CanEdit"); addMenu(new ListObjectCanEdit, "List.Object.CanEdit");
addMenu(new ListObjectDerender, "List.Object.Derender");
addMenu(new ListExperienceAllow, "List.Experience.Allow"); addMenu(new ListExperienceAllow, "List.Experience.Allow");
addMenu(new ListExperienceForget, "List.Experience.Forget"); addMenu(new ListExperienceForget, "List.Experience.Forget");
addMenu(new ListExperienceBlock, "List.Experience.Block"); addMenu(new ListExperienceBlock, "List.Experience.Block");

4
indra/newview/skins/default/xui/en-us/menu_objects_list.xml
View File

@@ -37,6 +37,10 @@
<on_visible function="List.Object.CanEdit" userdata=""/> <on_visible function="List.Object.CanEdit" userdata=""/>
</menu_item_call> </menu_item_call>
<menu_item_separator/> <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"> <menu_item_call label="Copy Key" name="Copy Key">
<on_click function="List.CopyUUIDs"/> <on_click function="List.CopyUUIDs"/>
<on_visible function="List.EnableAnySelected"/> <on_visible function="List.EnableAnySelected"/>

4
indra/newview/skins/default/xui/en-us/menu_url_objectim.xml
View File

@@ -76,6 +76,10 @@
<on_click function="List.Object.Edit" userdata=""/> <on_click function="List.Object.Edit" userdata=""/>
<on_visible function="List.Object.CanEdit" userdata=""/> <on_visible function="List.Object.CanEdit" userdata=""/>
</menu_item_call> </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_separator
layout="topleft" /> layout="topleft" />
<menu_item_call <menu_item_call