SL-24485, SL-40331, SL-23136, SL-40330, SL-25816, SL-40567,

SL-40568: land moss/linuxmisc-r60383: misc linuxclient & opensource
fixes.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@60383
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmisc-r60383 ->
release

5 files changed, 180 insertions, 3 deletions

diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
new file mode 100644
index 0000000000..6c7acfa187
--- /dev/null
+++ b/indra/newview/featuretable_linux.txt
@@ -0,0 +1,173 @@
+version 10
+
+// NOTE: This is mostly identical to featuretable.txt with a few differences
+// Should be combined into one table
+
+//
+// Generates lists of feature mask that can be applied on top of each other.
+//
+//		//		Begin comments
+//		list <name>
+//		Starts a feature list named <name>
+//		<name> <available> <recommended>
+//		<name> is the name of a feature
+//		<available> is 0 or 1, whether the feature is available
+//		<recommended> is an S32 which is the recommended value
+//
+// For now, the first list read sets up all of the default values
+//
+
+
+//
+// All contains everything at their default settings for high end machines
+// NOTE: All settings are set to the MIN of applied values, including 'all'!
+//
+list all
+RenderVBO			1	1
+RenderAniso			1	0
+RenderAvatarMode	1	2
+RenderAvatarVP		1	1
+RenderDistance		1	128
+RenderLighting		1	1
+RenderObjectBump	1	1
+RenderParticleCount	1	4096
+RenderRippleWater	1	1
+RenderTerrainDetail	1	2
+VertexShaderEnable	1	1
+
+//
+// Class 0 Hardware (Unknown or just old)
+//
+list Class0
+VertexShaderEnable	1	0
+RenderVBO			1	0
+RenderDistance		1	64
+RenderAvatarVP		1	0
+RenderAvatarMode	1	0
+RenderLighting		1	0
+RenderObjectBump	1	0
+RenderRippleWater	1	0
+
+//
+// Class 1 Hardware
+//
+list Class1
+VertexShaderEnable	1	0
+RenderVBO			1	1
+RenderDistance		1	96
+RenderAvatarVP		1	1
+RenderAvatarMode	1	0
+RenderLighting		1	0
+RenderObjectBump	1	0
+RenderRippleWater	1	0
+
+//
+// Class 2 Hardware (make it purty)
+//
+list Class2
+VertexShaderEnable	1	1
+RenderAvatarVP		1	1
+RenderAvatarMode	1	1
+RenderLighting		1	1
+RenderObjectBump	1	1
+RenderRippleWater	1	1
+
+//
+// Class 3 Hardware (make it purty)
+//
+list Class3
+VertexShaderEnable	1	1
+RenderAvatarVP		1	1
+RenderAvatarMode	1	1
+RenderLighting		1	1
+RenderObjectBump	1	1
+RenderRippleWater	1	1
+
+//
+// No Pixel Shaders available
+//
+list NoPixelShaders
+VertexShaderEnable	0	0
+RenderAvatarVP		0  0
+
+//
+// No Vertex Shaders available
+//
+list NoVertexShaders
+VertexShaderEnable	0	0
+RenderAvatarVP		0  0
+
+//
+// "Default" setups for safe, low, medium, high
+//
+list safe
+RenderVBO			1	0
+RenderAniso			1	0
+RenderAvatarVP		0	0
+RenderLighting		1	0
+RenderParticleCount	1	1024
+RenderTerrainDetail 1	0
+
+
+list low
+RenderVBO			1	0
+RenderAniso			1	0
+RenderLighting		1	0
+
+list medium
+RenderLighting		1	0
+
+
+//
+// CPU based feature masks
+//
+
+// 1Ghz or less (equiv)
+list CPUSlow
+RenderParticleCount	1	1024
+
+
+//
+// RAM based feature masks
+//
+list RAM256MB
+RenderObjectBump	0	0
+
+
+//
+// Graphics card based feature masks
+//
+list OpenGLPre15
+RenderVBO			1	0
+
+list Intel
+RenderVBO			1	0
+RenderAniso			1	0
+RenderLighting		1	0
+RenderTerrainDetail	1	0
+
+list GeForce2
+RenderVBO			1	1
+RenderAniso			1	0
+RenderLighting		1	0
+RenderParticleCount	1	2048
+RenderTerrainDetail	1	0
+
+list GeForce3
+
+list ATI
+
+list Radeon8500
+RenderLighting		1	0
+RenderParticleCount	1	4096
+
+// Hacked to be paranoid "safe"
+list Radeon9700
+RenderParticleCount	1	4096
+
+// Hacked to be paranoid "safe"
+list MobilityRadeon9000
+RenderLighting		1	0
+RenderParticleCount	1	4096
+
+list GeForceFX
diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt
index cabb0345db..63086c8437 100644
--- a/indra/newview/linux_tools/client-readme.txt
+++ b/indra/newview/linux_tools/client-readme.txt
@@ -97,7 +97,6 @@ the Alpha release of the Linux client.
   implemented on the Linux client and are therefore known not to work properly
   at this time:
   * QuickTime movie playback and movie recording
-  * Video memory detection
   * Full Unicode font rendering
   * Auto-updater
 
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 15ab9bac1d..3939c14dbb 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -7056,7 +7056,7 @@ void LLAgent::queryWearableCache()
 	// Look up affected baked textures.
 	// If they exist:
 	//		disallow updates for affected layersets (until dataserver responds with cache request.)
-	//		If cache miss…turn updates back on and invalidate composite.
+	//		If cache miss, turn updates back on and invalidate composite.
 	//		If cache hit, modify baked texture entries.
 	//
 	// Cache requests contain list of hashes for each baked texture entry.
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 7d7c2017aa..2b58e2b4c3 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -40,6 +40,8 @@ extern void write_debug(const std::string& str);
 
 #if LL_DARWIN
 const char FEATURE_TABLE_FILENAME[] = "featuretable_mac.txt";
+#elif LL_LINUX
+const char FEATURE_TABLE_FILENAME[] = "featuretable_linux.txt";
 #else
 const char FEATURE_TABLE_FILENAME[] = "featuretable.txt";
 #endif
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e9dfa0a382..716f83611c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -64,7 +64,6 @@ class ViewerManifest(LLManifest):
                                 self.end_prefix("html/*")
                         self.end_prefix("skins")
 
-                self.path("featuretable.txt")
                 self.path("releasenotes.txt")
                 self.path("lsl_guide.html")
                 self.path("gpu_table.txt")
@@ -115,6 +114,8 @@ class WindowsManifest(ViewerManifest):
                 self.path(self.find_existing_file('ReleaseForDownload/llkdu.dll', 'llkdu.dll', '../../libraries/i686-win32/lib_release/llkdu.dll'), dst='llkdu.dll')
                 self.path(src="licenses-win32.txt", dst="licenses.txt")
 
+                self.path("featuretable.txt")
+
                 # For use in crash reporting (generates minidumps)
                 self.path("dbghelp.dll")
 
@@ -388,6 +389,8 @@ class Linux_i686Manifest(LinuxManifest):
                         # recurse
                         self.end_prefix("res-sdl")
 
+                self.path("featuretable_linux.txt")
+
                 self.path("app_settings/mozilla-runtime-linux-i686")
 
                 if self.prefix("../../libraries/i686-linux/lib_release_client", "lib"):