diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-01 22:07:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-01 22:07:12 -0400 |
| commit | 8bfd3201de0d135ef984dc270e83ea88d8f03dd6 (patch) | |
| tree | 040272fc843ed2b00c9b9b162dad9fa503ef078a /indra/newview/llmanipscale.cpp | |
| parent | 68088a27ba92d8a3ce84ee6e5691e9e2e08b7b32 (diff) | |
| parent | 361384ebb9f41dbccbaab779a085edb773f0a734 (diff) | |
merge changes for latest viewer-development
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; |