Merge remote branch 'mccabe/1.3.0-next' into next

Conflicts:
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/skins/default/xui/de/floater_about.xml
	linden/indra/newview/skins/default/xui/fr/floater_about.xml
	linden/indra/newview/skins/default/xui/ja/floater_about.xml
	linden/indra/newview/skins/default/xui/ko/floater_about.xml
	linden/indra/newview/skins/default/xui/zh/floater_about.xml
	linden/install.xml

1 files changed, 6 insertions, 0 deletions

diff --git a/linden/indra/newview/featuretable_solaris.txt b/linden/indra/newview/featuretable_solaris.txt
index 2a514ea..f24cbde 100644
--- a/linden/indra/newview/featuretable_solaris.txt
+++ b/linden/indra/newview/featuretable_solaris.txt
@@ -35,6 +35,8 @@ RenderRippleWater	1	1
 RenderTerrainDetail     1       2
 VertexShaderEnable      1       1
 RenderTextureMemoryMultiple             1       1.0
+UseOcclusion            1       1
+RenderCubeMap           1       1
 
 //
 // Class 0 Hardware (Unknown or just old)
@@ -108,6 +110,8 @@ RenderAvatarVP		0	0
 RenderLighting          1       0
 RenderParticleCount     1       1024
 RenderTerrainDetail 1   0
+RenderCubeMap           0       0
+UseOcclusion            0       0
 
 
 list low
@@ -146,6 +150,7 @@ RenderVBO			1	0
 RenderAniso                     1       0
 RenderLighting          1       0
 RenderTerrainDetail     1       0
+RenderCubeMap           0       0
 
 list GeForce2
 RenderVBO                       1       1
@@ -157,6 +162,7 @@ RenderTerrainDetail	1	0
 list GeForce3
 
 list ATI
+UseOcclusion            0       0
 
 list Radeon8500
 RenderLighting          1       0