Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2014-02-20 10:31:47 +01:00
parent 41416dcffe 1c48aa8f97
commit ebb46999d8
6 changed files with 645 additions and 124 deletions
--- a/indra/newview/app_settings/settings_sh.xml
+++ b/indra/newview/app_settings/settings_sh.xml
@@ -240,5 +240,16 @@
      <key>Value</key>
      <real>.5</real>
    </map>
+    <key>SHAltBatching</key>
+    <map>
+      <key>Comment</key>
+      <string>Experimental retooling of face batching.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <real>1</real>
+    </map>
  </map>
 </llsd>