diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 089593bd7..bd07c8ddb 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3582,7 +3582,7 @@ bool enable_standup_self()
 bool enable_sitdown_self()
 {
 // [RLVa:KB] - Checked: 2010-08-28 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
-	return isAgentAvatarValid() && !gAgentAvatarp->isSitting() && !gAgent.getFlying() && !gRlvHandler.hasBehaviour(RLV_BHVR_SIT);
+	return isAgentAvatarValid() && !gAgentAvatarp->isSitting() /*&& !gAgent.getFlying()*/ && !gRlvHandler.hasBehaviour(RLV_BHVR_SIT);
 // [/RLVa:KB]
 //    return isAgentAvatarValid() && !gAgentAvatarp->isSitting() && !gAgent.getFlying();
 }
@@ -3591,8 +3591,6 @@ class LLSelfEnableSitOrStand : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-//		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-
 		std::string label;
 		std::string sit_text;
 		std::string stand_text;
@@ -3613,8 +3611,7 @@ class LLSelfEnableSitOrStand : public view_listener_t
 			new_value = false;
 
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-		gMenuHolder->childSetText("Self Sit", label);
-		gMenuHolder->childSetText("Self Sit Attachment", label);
+		gMenuHolder->childSetText("Stand Up", label);
 
 		return true;
 	}
@@ -3974,6 +3971,7 @@ void near_sit_down_point(BOOL success, void *)
 {
 	if (success)
 	{
+		if (!gSavedSettings.getBOOL("LiruContinueFlyingOnUnsit"))
 		gAgent.setFlying(FALSE);
 		gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
 
diff --git a/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml b/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
index cde6e985b..39d48e446 100644
--- a/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
@@ -12,8 +12,8 @@
 		<on_enable function="Object.EnableTouch" userdata="Touch" name="EnableTouch"/>
 	</menu_item_call>
 	<menu_item_call enabled="true" label="Stand Up" name="Stand Up">
-		<on_click function="Self.StandUp" userdata="" />
-		<on_enable function="Self.EnableStandUp" />
+		<on_click function="Self.SitOrStand"/>
+		<on_enable function="Self.EnableSitOrStand" userdata="Sit Down,Stand Up"/>
 	</menu_item_call>
 	<menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
 		<on_click function="Attachment.Detach" />