diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-07 14:42:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-07 14:42:54 -0500 |
| commit | f1784209d5fc4e3f9402fbc8fa66de5a67a73f70 (patch) | |
| tree | 56922332d7fce623e1ad973e09f72d9dd982b289 /indra/newview/llmanipscale.cpp | |
| parent | 690f18c948003c9d14524da8cdf5b82da8227758 (diff) | |
| parent | 81af06c95490a54e69b6bbf01ae2ef98adb66a02 (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) { |