Moved some settings out of the main settings.xml and into settings_sh.xml where they belong.

indra/newview/app_settings/settings.xml

@@ -474,42 +474,7 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
-  </map>
+	</map>
-    <key>ShyotlRenderVBOStrideMode</key>
-    <map>
-      <key>Comment</key>
-      <string>0 = Standard behavior
-1 = Force strided VBOs
-2 = Force unstrided(dense) VBOs</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>U32</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>ShyotlUseLegacyRenderPath</key>
-    <map>
-      <key>Comment</key>
-      <string>Use deprecated pre-3.x OpenGL api calls.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>ShyotlUseLegacyTextureBatching</key>
-    <map>
-      <key>Comment</key>
-      <string>Disable usage of extra samplers in shaders. Decreases batch sizes, however also reduces branching in shaders drastcially.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>  
     <key>ResetFocusOnSelfClick</key>
 		<map>
 		<key>Comment</key>

indra/newview/app_settings/settings_sh.xml

@@ -168,5 +168,84 @@
       <key>Value</key>
       <real>10.0</real>
     </map>
+    <key>ShyotlRenderVBOStrideMode</key>
+    <map>
+      <key>Comment</key>
+      <string>0 = Standard behavior
+1 = Force strided VBOs
+2 = Force unstrided(dense) VBOs</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>ShyotlUseLegacyRenderPath</key>
+    <map>
+      <key>Comment</key>
+      <string>Use deprecated pre-3.x OpenGL api calls.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>ShyotlUseLegacyTextureBatching</key>
+    <map>
+      <key>Comment</key>
+      <string>Disable usage of extra samplers in shaders. Decreases batch sizes, however also reduces branching in shaders drastically.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+	<key>ShyotlUseLegacyDynamicTexture</key>
+    <map>
+      <key>Comment</key>
+      <string>Disable shader path when rendering dynamic textures.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+	<key>ShyotlUseLegacyTextureBaking</key>
+    <map>
+      <key>Comment</key>
+      <string>Disable shader path when generating baked textures.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+	<key>ShyotlDumpRawShaders</key>
+    <map>
+      <key>Comment</key>
+      <string>Dump shader data being passed to glShaderSourceARB.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+	<key>ShyotlDrawOrphanAttachments</key>
+    <map>
+      <key>Comment</key>
+      <string>Render attachments lacking an 'alive' owner.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
   </map>
 </llsd>