diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-09 00:29:37 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-09 00:29:37 -0500 |
| commit | 75e366dd6f9abd50263c87e0e8106dc0abbcefb4 (patch) | |
| tree | f53c8ca99c0a9add07b352c4ef04b7de64281271 /indra/newview/llmanipscale.cpp | |
| parent | 3ede390b87507cd6a6ef31ac3f1be1906abcb723 (diff) | |
| parent | 6d953e60b74538aa26b7bfe4ceeee44ac7eefead (diff) | |
merge
Diffstat (limited to 'indra/newview/llmanipscale.cpp')
| -rw-r--r-- | indra/newview/llmanipscale.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp index 673f28e01f..0eedabb5de 100644 --- a/indra/newview/llmanipscale.cpp +++ b/indra/newview/llmanipscale.cpp @@ -58,6 +58,7 @@ #include "llworld.h" #include "v2math.h" #include "llvoavatar.h" +#include "llmeshrepository.h" const F32 MAX_MANIP_SELECT_DISTANCE_SQUARED = 11.f * 11.f; @@ -90,9 +91,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 (gSavedSettings.getBOOL("MeshEnabled") && - gAgent.getRegion() && - !gAgent.getRegion()->getCapability("GetMesh").empty() && + if (gMeshRepo.meshRezEnabled() && !gAgent.getRegion()->getCapability("ObjectAdd").empty() && !is_flora) { |