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

Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/lloverlaybar.cpp

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>