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

indra/newview/llmanipscale.cpp

@@ -58,11 +58,15 @@
 #include "llui.h"
 #include "llviewercamera.h"
 #include "llviewerobject.h"
+#include "llviewerregion.h"
 #include "llviewerwindow.h"
 #include "llhudrender.h"
 #include "llworld.h"
 #include "v2math.h"
 #include "llvoavatar.h"
+#if MESH_ENABLED
+#include "llmeshrepository.h"
+#endif //MESH_ENABLED
 
 
 const F32 MAX_MANIP_SELECT_DISTANCE_SQUARED = 11.f * 11.f;
@@ -96,10 +100,7 @@ F32 get_default_max_prim_scale(bool is_flora)
 	// a bit of a hack, but if it's foilage, we don't want to use the
 	// new larger scale which would result in giant trees and grass
 #if MESH_ENABLED
-	if (gSavedSettings.getBOOL("MeshEnabled") && 
-		gAgent.getRegion() && 
-		!gAgent.getRegion()->getCapability("GetMesh").empty() &&
-		!gAgent.getRegion()->getCapability("ObjectAdd").empty() &&
+	if (gMeshRepo.meshRezEnabled() &&
 		!is_flora)
 	{
 		return DEFAULT_MAX_PRIM_SCALE;