diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 9f13414c17..b4aa1aef60 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -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");
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index 36c1577976..acc8303488 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -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"
diff --git a/indra/newview/skins/default/xui/en/menu_pie_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_pie_attachment_self.xml
index c05d8ad7be..3746c2d182 100644
--- a/indra/newview/skins/default/xui/en/menu_pie_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_pie_attachment_self.xml
@@ -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