diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index c2d96a682e68b1c2a3c1b21897e4a5610df2b4f0..6d367955689c65c73d1c12987e7c585eea2b62b2 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -279,6 +279,8 @@
          tooltip_ref="Command_Environments_Tooltip"
          execute_function="Floater.ToggleOrBringToFront"
          execute_parameters="my_environments"
+         is_enabled_function="RLV.EnableIfNot"
+         is_enabled_parameters="setenv"
          is_running_function="Floater.IsOpen"
          is_running_parameters="my_environments"
            />
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index c3438e2ab076bcd87cd222a87d8958623c9ae19b..0535cea5b102742bc41300d1e517a37b1fefca1b 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8979,8 +8979,8 @@ class LLWorldEnvSettings : public view_listener_t
 
 	bool handleEvent(const LLSD& userdata)
 	{
-// [RLVa:KB] - Checked: 2010-03-18 (RLVa-1.2.0a) | Modified: RLVa-1.0.0g
-		if (gRlvHandler.hasBehaviour(RLV_BHVR_SETENV))
+// [RLVa:KB] - @setenv
+		if (!RlvActions::canChangeEnvironment())
 			return true;
 // [/RLVa:KB]
 
@@ -9807,10 +9807,7 @@ void initialize_menus()
 
 // [RLVa:KB] - Checked: RLVa-2.0.0
 	enable.add("RLV.MainToggleVisible", boost::bind(&rlvMenuMainToggleVisible, _1));
-	if (RlvActions::isRlvEnabled())
-	{
-		enable.add("RLV.CanShowName", boost::bind(&rlvMenuCanShowName));
-		enable.add("RLV.EnableIfNot", boost::bind(&rlvMenuEnableIfNot, _2));
-	}
+	enable.add("RLV.CanShowName", boost::bind(&rlvMenuCanShowName));
+	enable.add("RLV.EnableIfNot", boost::bind(&rlvMenuEnableIfNot, _2));
 // [/RLVa:KB]
 }
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index 2dad3a4d00123f9be09e85bab010c8a24f4a0d85..7880ce5321dd2ff89672b11d6bfc22b16f2f988c 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -728,8 +728,13 @@ void rlvMenuToggleVisible()
 
 bool rlvMenuCanShowName()
 {
-  const LLVOAvatar* pAvatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
-  return (pAvatar) && (RlvActions::canShowName(RlvActions::SNC_DEFAULT, pAvatar->getID()));
+	bool fEnable = true;
+	if (rlv_handler_t::isEnabled())
+	{
+		const LLVOAvatar* pAvatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
+		fEnable = (pAvatar) && (RlvActions::canShowName(RlvActions::SNC_DEFAULT, pAvatar->getID()));
+	}
+	return fEnable;
 }
 
 // Checked: 2010-04-23 (RLVa-1.2.0g) | Modified: RLVa-1.2.0g
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index efbc953507e26a353a737a7031b87757bd39ad37..420e75437d1b38441840059fa8e8d76cab25c937 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -727,6 +727,9 @@
 	     	 	<menu_item_call.on_click
 	     	 	 function="World.EnvSettings"
                  parameter="my_environs" />
+				<menu_item_call.on_enable
+				 function="RLV.EnableIfNot"
+				 parameter="setenv" />
 	     	</menu_item_call>
 	     	
 <menu_item_call
@@ -735,6 +738,9 @@
 	     	 	 	<menu_item_call.on_click
 	     	 	 	function="World.EnvSettings"
 	     	 	 	parameter="adjust_tool" />
+					<menu_item_call.on_enable
+					 function="RLV.EnableIfNot"
+					 parameter="setenv" />
 	     	 	</menu_item_call>
 	     	 	<menu_item_separator/>
 	     	 	 <menu_item_check
@@ -746,6 +752,9 @@
 	     	 	 	<menu_item_check.on_check
 	     	 	 	function="World.EnableEnvSettings" 
 	     	 	 	parameter="pause_clouds" />
+					<menu_item_call.on_enable
+					 function="RLV.EnableIfNot"
+					 parameter="setenv" />
 	     	 	</menu_item_check>
 	     	</menu>