Flipped the MESH_ENABLED switch. Added missing components and updated stuff to be closer to mesh-development head.

indra/llrender/llglslshader.cpp

@@ -63,6 +63,9 @@ LLShaderFeatures::LLShaderFeatures()
 : calculatesLighting(false), isShiny(false), isFullbright(false), hasWaterFog(false),
 hasTransport(false), hasSkinning(false), hasAtmospherics(false), isSpecular(false),
 hasGamma(false), hasLighting(false), calculatesAtmospherics(false)
+#if MESH_ENABLED
+, hasObjectSkinning(false)
+#endif //MESH_ENABLED
 {
 }
 

indra/llrender/llglslshader.h

@@ -48,6 +48,9 @@ public:
 	bool hasWaterFog; // implies no gamma
 	bool hasTransport; // implies no lighting (it's possible to have neither though)
 	bool hasSkinning;	
+#if MESH_ENABLED
+	bool hasObjectSkinning;
+#endif //MESH_ENABLED
 	bool hasAtmospherics;
 	bool hasGamma;
 

indra/llrender/llshadermgr.cpp

@@ -152,6 +152,16 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
 			return FALSE;
 		}
 	}
+
+#if MESH_ENABLED
+	if (features->hasObjectSkinning)
+	{
+		if (!shader->attachObject("avatar/objectSkinV.glsl"))
+		{
+			return FALSE;
+		}
+	}
+#endif //MESH_ENABLED
 	
 	///////////////////////////////////////
 	// Attach Fragment Shader Features Next