From 095a321eb6eb1edb7125a7338b35b064ab6c3b06 Mon Sep 17 00:00:00 2001
From: leyla_linden <none@none>
Date: Thu, 24 Feb 2011 15:01:14 -0800
Subject: SH-1045 Mesh Viewer temporarily allows object scaling larger than
 10m, then moves the object

---
 indra/newview/llmanipscale.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index 683f455179..dcbf17e31f 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -52,6 +52,7 @@
 #include "llui.h"
 #include "llviewercamera.h"
 #include "llviewerobject.h"
+#include "llviewerregion.h"
 #include "llviewerwindow.h"
 #include "llhudrender.h"
 #include "llworld.h"
@@ -89,7 +90,10 @@ 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 (gSavedSettings.getBOOL("MeshEnabled") && !is_flora)
+	if (gSavedSettings.getBOOL("MeshEnabled") && 
+		gAgent.getRegion() && 
+		!gAgent.getRegion()->getCapability("GetMesh").empty() &&
+		!is_flora)
 	{
 		return DEFAULT_MAX_PRIM_SCALE;
 	}
-- 
cgit v1.2.3