livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-10082: Don't enable derendering your own attachments when RLVa is enabled

meow-7.2.2
Cinders 2013-04-29 00:04:40 -06:00
parent 5febe7c70a
commit 9bc34a7d03
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewermenu.cpp
View File

@ -2798,6 +2798,13 @@ class LLObjectDerender : public view_listener_t
};
// </FS:Ansariel>
// <FS:CR> FIRE-10082 - Don't enable derendering own attachments when RLVa is enabled
bool enable_derender_object()
{
return (!rlv_handler_t::isEnabled());
}
// </FS:CR>
class LLEnableEditParticleSource : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
@ -10283,6 +10290,7 @@ void initialize_menus()
view_listener_t::addMenu(new LLObjectMute(), "Object.Mute");
view_listener_t::addMenu(new LLObjectDerender(), "Object.Derender");
view_listener_t::addMenu(new LLObjectDerenderPermanent(), "Object.DerenderPermanent"); // <FS:Ansariel> Optional derender & blacklist
enable.add("Object.EnableDerender", boost::bind(&enable_derender_object)); // <FS:CR> FIRE-10082 - Don't enable derendering own attachments when RLVa is enabled as well
view_listener_t::addMenu(new LLObjectTexRefresh(), "Object.TexRefresh"); // ## Zi: Texture Refresh
view_listener_t::addMenu(new LLEditParticleSource(), "Object.EditParticles");
view_listener_t::addMenu(new LLEnableEditParticleSource(), "Object.EnableEditParticles");

4
indra/newview/skins/default/xui/en/menu_attachment_self.xml
View File

@ -144,6 +144,8 @@ name="Edit Outfit">
name="Derender">
<menu_item_call.on_click
function="Object.Derender" />
<menu_item_call.on_enable
function="Object.EnableDerender" />
</menu_item_call>
<menu_item_call
enabled="true"
@ -151,6 +153,8 @@ name="Edit Outfit">
name="DerenderPermanent">
<menu_item_call.on_click
function="Object.DerenderPermanent" />
<menu_item_call.on_enable
function="Object.EnableDerender" />
</menu_item_call>
<menu_item_call
label="Show Textures"

4
indra/newview/skins/default/xui/en/menu_pie_attachment_self.xml
View File

@ -58,6 +58,8 @@
name="Derender">
<pie_slice.on_click
function="Object.Derender" />
<pie_slice.on_enable
function="Object.EnableDerender" />
</pie_slice>
<pie_slice
enabled="true"
@ -65,6 +67,8 @@
name="DerenderPermanent">
<pie_slice.on_click
function="Object.DerenderPermanent" />
<pie_slice.on_enable
function="Object.EnableDerender" />
</pie_slice>
</pie_menu>
<pie_slice