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

Conflicts:
	indra/newview/llvovolume.cpp

indra/newview/app_settings/shaders/class1/effects/PosterizeF.glsl

@@ -0,0 +1,23 @@
+/**
+ * @file colorFilterF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+ 
+#extension GL_ARB_texture_rectangle : enable
+ 
+#ifdef DEFINE_GL_FRAGCOLOR
+out vec4 gl_FragColor;
+#endif
+
+uniform sampler2DRect tex0;
+uniform int layerCount;
+
+VARYING vec2 vary_texcoord0;
+
+void main(void) 
+{
+	vec3 color = pow(floor(pow(vec3(texture2D(tex0, vary_texcoord0.st)),vec3(.6)) * layerCount)/layerCount,vec3(1.66666));
+	gl_FragColor = vec4(color, 1.0);
+}

indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl

@@ -23,9 +23,9 @@
  * $/LicenseInfo$
  */
 
-ATTRIBUTE ivec4 texture_index;
+ATTRIBUTE int texture_index;
 
-VARYING_FLAT ivec4 vary_texture_index;
+VARYING_FLAT int vary_texture_index;
 
 void passTextureIndex()
 {

indra/newview/app_settings/windlight/postprocesseffects.xml

@@ -174,6 +174,8 @@
 			<boolean>0</boolean>
 			<key>enable_gauss_blur</key>
 			<boolean>0</boolean>
+      <key>enable_posterize</key>
+      <boolean>0</boolean>
 			<key>gauss_blur_passes</key>
 			<integer>2</integer>
 			<key>extract_high</key>
@@ -186,6 +188,8 @@
 			<real>0.40000000000000002</real>
 			<key>saturation</key>
 			<real>1</real>
-		</map>
+      <key>posterize_layers</key>
+      <real>10</real>
+    </map>
 	</map>
 </llsd>