diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 77f6ce6db8..9154cd5f73 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14280,6 +14280,17 @@ Change of this parameter will affect the layout of buttons in notification toast
 			<key>Value</key>
 			<integer>1</integer>
 		</map>
+		<key>PhoenixBlockClickSit</key>
+		<map>
+			<key>Comment</key>
+			<string>Prevents sitting on left-click.</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>Boolean</string>
+			<key>Value</key>
+			<integer>0</integer>
+		</map>
 		
 </map>
 </llsd>
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index e94e95650d..0b54367a66 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -217,7 +217,7 @@ BOOL LLToolPie::pickLeftMouseDownCallback()
 			break;
 		case CLICK_ACTION_SIT:
 			{
-				if (isAgentAvatarValid() && !gAgentAvatarp->isSitting()) // agent not already sitting
+				if (isAgentAvatarValid() && !gAgentAvatarp->isSitting() && !gSavedSettings.getBOOL("PhoenixBlockClickSit")) // agent not already sitting
 				{
 					handle_object_sit_or_stand();
 					// put focus in world when sitting on an object
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index 13910cbc0e..5f9e79441f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -299,6 +299,29 @@
 
 	</panel>
 
+
+	<!--Protection-->
+	<panel
+	 border="true"
+	 top_pad="5"
+	 bottom="-1"
+	 left="1"
+	 right="-1"
+	 follows="all"
+	 label="Protection"
+	 name="ProtectionTab">
+		<check_box
+		 top_pad="12"
+		 left="10"
+		 label="Block left-click sitting on objects"
+		 control_name="PhoenixBlockClickSit"
+		 follows="left|top"
+		 height="16"
+		 name="PhoenixBlockClickSit"
+		 width="256" />
+	</panel>
+
+
 	<!--View-->
 	<panel
 	 border="true"