Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Canon

2013-02-27 15:47:03 -05:00
parent 09c8be1673 c9ab38d449
commit 4990af9cfd
29 changed files with 444 additions and 261 deletions
--- a/indra/newview/app_settings/settings_sh.xml
+++ b/indra/newview/app_settings/settings_sh.xml
@@ -50,7 +50,7 @@
      <key>Type</key>
      <string>U32</string>
      <key>Value</key>
-      <integer>7000</integer>
+      <integer>15000</integer>
    </map>
    <key>SHFMODExDecodeBufferSize</key>
    <map>
@@ -61,7 +61,7 @@
      <key>Type</key>
      <string>U32</string>
      <key>Value</key>
-      <integer>1000</integer>
+      <integer>2000</integer>
    </map>
 		<key>SHAllowScriptCommands</key>
 		<map>
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -26,7 +26,7 @@

 ATTRIBUTE vec4 weight4;  

-uniform mat4 matrixPalette[64];
+uniform mat4 matrixPalette[32];

 mat4 getObjectSkinnedTransform()
 {