diff options
| author | Tofu Buzzard <no-email> | 2011-02-24 18:28:31 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-24 18:28:31 -0800 |
| commit | 1a3255c38c074f27e43fcf31f7def501b286aa43 (patch) | |
| tree | 0b6a03e314f4c946545b8343ac56ec9f6e1cff93 /indra/newview/llmanipscale.cpp | |
| parent | b73a1dc3a2b9477e5fb6aca4083542793c82e470 (diff) | |
| parent | 41dc7188ea0b5a1031e82ef8a1b3861107b16216 (diff) | |
merge
Diffstat (limited to 'indra/newview/llmanipscale.cpp')
| -rw-r--r-- | indra/newview/llmanipscale.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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; } |