diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-06-01 15:44:46 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-06-01 15:44:46 -0700 |
| commit | 926a9dcb58106650e8efda7a8a32b58bb6fcbd9e (patch) | |
| tree | 6d569bbcee6f8448f3307149e4394e9dee9b20b8 /indra/newview/llmanipscale.cpp | |
| parent | fe9eccdbae9af3c61bff4637c1a61cdc09068a32 (diff) | |
| parent | 5093f604cb04e8de54750498fd7fa01538f4b22c (diff) | |
merge
Diffstat (limited to 'indra/newview/llmanipscale.cpp')
| -rw-r--r-- | indra/newview/llmanipscale.cpp | 1 |
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; |