diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b8bc3a8339..e6bf889718 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -20040,5 +20040,16 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSMaxAnimationPriority</key>
+    <map>
+      <key>Comment</key>
+      <string>Allow uploading animations with higher priority (up to 7) NOTE: Only priorities up to level 5 are supported! (Default: 4)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>4</integer>
+    </map>
 </map>
 </llsd>
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp
index 4c46c60fc0..e1e4ee4169 100644
--- a/indra/newview/llfloaterbvhpreview.cpp
+++ b/indra/newview/llfloaterbvhpreview.cpp
@@ -219,6 +219,16 @@ BOOL LLFloaterBvhPreview::postBuild()
 	
 	mStopButton = getChild<LLButton>( "stop_btn");
 	mStopButton->setClickedCallback(boost::bind(&LLFloaterBvhPreview::onBtnStop, this));
+	
+// <FS:CR> Allow Higher priority animations to be uploaded
+	LLSpinCtrl* spinner = getChild<LLSpinCtrl>("priority");
+	U32 max_value = gSavedSettings.getU32("FSMaxAnimationPriority");
+	// Never allow a higher priority than 7 because that's ridiculous.
+	if (max_value > 7) max_value = 7;
+	// Also, disallow setting to 0 because that's stupidness.
+	if (max_value < 1) max_value = 1;
+	spinner->setMaxValue(max_value);
+// </FS:CR>
 
 	loadBVH();