Merge vwr-dev-mat

5 files changed, 20 insertions, 210 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ff3faaf92c..c064b420f3 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -291,17 +291,6 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
-    <key>AudioLevelUnderwaterRolloff</key>
-    <map>
-      <key>Comment</key>
-      <string>Controls the distance-based dropoff of audio volume underwater(fraction or multiple of default audio rolloff)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>5.0</real>
-    </map>
     <key>AudioLevelSFX</key>
     <map>
       <key>Comment</key>
@@ -2015,39 +2004,6 @@
       <key>Value</key>
       <string />
     </map>
-	<key>DebugAvatarAppearanceMessage</key>
-  <map>
-    <key>Comment</key>
-    <string>Dump a bunch of XML files when handling appearance messages</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
-  <key>DebugAvatarExperimentalServerAppearanceUpdate</key>
-  <map>
-    <key>Comment</key>
-    <string>Experiment with sending full cof_contents instead of cof_version</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
-    <key>DebugAvatarAppearanceServiceURLOverride</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to use for baked texture requests; overrides value returned by login server.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string />
-    </map>
 	<key>DebugAvatarRezTime</key>
 	<map>
 		<key>Comment</key>
@@ -2070,17 +2026,6 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-    <key>DebugAvatarCompositeBaked</key>
-  <map>
-    <key>Comment</key>
-    <string>Colorize avatar meshes based on baked/composite state.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
     <key>DebugBeaconLineWidth</key>
     <map>
       <key>Comment</key>
@@ -2092,17 +2037,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>DebugForceAppearanceRequestFailure</key>
-    <map>
-      <key>Comment</key>
-      <string>Request wrong cof version to test the failure path for server appearance update requests.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>DebugHideEmptySystemFolders</key>
     <map>
       <key>Comment</key>
@@ -4436,28 +4370,6 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
-    <key>InventoryDebugSimulateOpFailureRate</key>
-    <map>
-      <key>Comment</key>
-        <string>Rate at which we simulate failures of copy/link requests in some operations</string>
-      <key>Persist</key>
-        <integer>1</integer>
-      <key>Type</key>
-        <string>F32</string>
-      <key>Value</key>
-        <real>0.0</real>
-    </map>
-    <key>InventoryDebugSimulateLateOpRate</key>
-    <map>
-      <key>Comment</key>
-        <string>Rate at which we simulate late-completing copy/link requests in some operations</string>
-      <key>Persist</key>
-        <integer>1</integer>
-      <key>Type</key>
-        <string>F32</string>
-      <key>Value</key>
-        <real>0.0</real>
-    </map>
     <key>InventoryDisplayInbox</key>
     <map>
         <key>Comment</key>
@@ -8559,7 +8471,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>512</real>
+    <real>1024</real>
   </map>
 
   <key>RenderSpecularResY</key>
@@ -8571,7 +8483,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>128</real>
+    <real>256</real>
   </map>
 
   <key>RenderSpecularExponent</key>
@@ -8980,28 +8892,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>DisableAllRenderTypes</key>
-    <map>
-      <key>Comment</key>
-      <string>Disables all rendering types.</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>DisableAllRenderFeatures</key>
-    <map>
-      <key>Comment</key>
-      <string>Disables all rendering features.</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>RenderHUDInSnapshot</key>
     <map>
       <key>Comment</key>
@@ -13439,28 +13329,6 @@
       <key>Value</key>
       <integer>-1</integer>
     </map>
-    <key>MaxFPS</key>
-    <map>
-      <key>Comment</key>
-      <string>Yield some time to the local host if we reach a threshold framerate.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <integer>-1.0</integer>
-    </map>
-    <key>ForcePeriodicRenderingTime</key>
-    <map>
-      <key>Comment</key>
-      <string>Periodically enable all rendering masks for a single frame.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <integer>-1.0</integer>
-    </map>
     <key>ZoomDirect</key>
     <map>
       <key>Comment</key>
@@ -14446,60 +14314,5 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>DisablePrecacheDelayAfterTeleporting</key>
-  <map>
-    <key>Comment</key>
-    <string>Disables the artificial delay in the viewer that precaches some incoming assets</string>
-    <key>Persist</key>
-    <integer>0</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
-  <key>FMODExProfilerEnable</key>
-  <map>
-    <key>Comment</key>
-    <string>Enable profiler tool if using FMOD Ex</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-    </map>
-  <key>FMODExDecodeBufferSize</key>
-  <map>
-    <key>Comment</key>
-    <string>Sets the streaming decode buffer size (in milliseconds)</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>U32</string>
-    <key>Value</key>
-    <integer>1000</integer>
-    </map>
-  <key>FMODExStreamBufferSize</key>
-  <map>
-    <key>Comment</key>
-    <string>Sets the streaming buffer size (in milliseconds)</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>U32</string>
-    <key>Value</key>
-    <integer>7000</integer>
-  </map>
-  <key>DisablePrecacheDelayAfterTeleporting</key>
-  <map>
-    <key>Comment</key>
-    <string>Disables the artificial delay in the viewer that precaches some incoming assets</string>
-    <key>Persist</key>
-    <integer>0</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
 </map>
 </llsd>
diff --git a/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl b/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
index 20a756530a..49ad064364 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
@@ -61,6 +61,6 @@ void main()
 	/// Gamma correct for WL (soft clip effect).
 	frag_data[0] = vec4(scaleSoftClip(color.rgb), 1.0);
 	frag_data[1] = vec4(0.0,0.0,0.0,0.0);
-	frag_data[2] = vec4(0.5,0.5,0.5,0);
+	frag_data[2] = vec4(0.5,0.5,0.0,0);
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index aafa932b8f..90cf085524 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -297,7 +297,6 @@ void main()
 	vec4 spec = texture2DRect(specularRect, vary_fragcoord.xy);
 	vec3 col;
 	float bloom = 0.0;
-	if (diffuse.a < 0.9)
 	{
 		calcAtmospherics(pos.xyz, 1.0);
 	
@@ -322,23 +321,19 @@ void main()
 			col += spec_contrib;
 		}
 	
+		col = mix(col.rgb, diffuse.rgb, diffuse.a);
+
 		if (envIntensity > 0.0)
 		{ //add environmentmap
 			vec3 env_vec = env_mat * refnormpersp;
 			col = mix(col.rgb, pow(textureCube(environmentMap, env_vec).rgb, vec3(2.2)) * 2.2, 
-				max(envIntensity-diffuse.a*2.0, 0.0)); 
+				envIntensity); 
 		}
 
 		col = atmosLighting(col);
 		col = scaleSoftClip(col);
-
-		col = mix(col.rgb, diffuse.rgb, diffuse.a);
 	}
-	else
-	{
-		col = diffuse.rgb;
-	}
-
+	
 	frag_color.rgb = col;
 
 	//frag_color.a = bloom;
diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
index 1ae006bc8a..de858b34b5 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
@@ -67,6 +67,12 @@ VARYING vec4 littleWave;
 VARYING vec4 view;
 VARYING vec4 vary_position;
 
+vec2 encode_normal(vec3 n)
+{
+	float f = sqrt(8 * n.z + 8);
+	return n.xy / f + 0.5;
+}
+
 void main() 
 {
 	vec4 color;
@@ -151,8 +157,8 @@ void main()
 	//spec *= shadow;
 	//color.rgb += spec * specular;
 	
-	color.rgb = atmosTransport(color.rgb);
-	color.rgb = scaleSoftClip(color.rgb);
+	//color.rgb = atmosTransport(color.rgb);
+	//color.rgb = scaleSoftClip(color.rgb);
 	//color.a = spec * sunAngle2;
 
 	//wavef.z *= 0.1f;
@@ -161,5 +167,5 @@ void main()
 	
 	frag_data[0] = vec4(color.rgb, 0.5); // diffuse
 	frag_data[1] = vec4(0.5,0.5,0.5, 0.95); // speccolor*spec, spec
-	frag_data[2] = vec4(screenspacewavef.xyz*0.5+0.5, screenspacewavef.z*0.5); // normalxyz, displace
+	frag_data[2] = vec4(encode_normal(screenspacewavef), 0.0, 0.0); // normalxyz, displace
 }
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 3d39394c32..466714c108 100755
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -300,7 +300,6 @@ void main()
 	vec3 col;
 	float bloom = 0.0;
 
-	if (diffuse.a < 0.9)
 	{
 		vec4 spec = texture2DRect(specularRect, vary_fragcoord.xy);
 		
@@ -331,22 +330,19 @@ void main()
 			col += spec_contrib;
 		}
 
+		col = mix(col, diffuse.rgb, diffuse.a);
+
 		if (envIntensity > 0.0)
 		{ //add environmentmap
 			vec3 env_vec = env_mat * refnormpersp;
 			col = mix(col.rgb, pow(textureCube(environmentMap, env_vec).rgb, vec3(2.2)) * 2.2, 
-				max(envIntensity-diffuse.a*2.0, 0.0)); 
+				envIntensity); 
 		}
 			
 		col = atmosLighting(col);
 		col = scaleSoftClip(col);
-
-		col = mix(col, diffuse.rgb, diffuse.a);
-	}
-	else
-	{
-		col = diffuse.rgb;
 	}
+	
 		
 	frag_color.rgb = col;
 	frag_color.a = bloom;