summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-05-26 16:48:15 -0400
committerLoren Shih <seraph@lindenlab.com>2011-05-26 16:48:15 -0400
commit74da6623dcc53f440935ea69dde5cf140c9c5c4b (patch)
tree09c63052811dd20ffe14741ff815af7b19a3c03b /indra
parentd5ae682e113d6a6f861b0d873a2fd061f8d03750 (diff)
SH-1668 FIXED Cubes can be scaled to 64^3
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llmanipscale.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index 738d82e732..673f28e01f 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -93,6 +93,7 @@ F32 get_default_max_prim_scale(bool is_flora)
if (gSavedSettings.getBOOL("MeshEnabled") &&
gAgent.getRegion() &&
!gAgent.getRegion()->getCapability("GetMesh").empty() &&
+ !gAgent.getRegion()->getCapability("ObjectAdd").empty() &&
!is_flora)
{
return DEFAULT_MAX_PRIM_SCALE;