diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-27 15:33:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-27 15:33:46 -0400 |
| commit | 0c360c5223af6473b701f2f41d525f1f70c2ead5 (patch) | |
| tree | dc59a8390988ece0d340632171f06e0af83507e1 /indra/newview/llmanipscale.cpp | |
| parent | 7a7a0f0c1bd134fa23d734d672ef44a763a9f228 (diff) | |
| parent | 170de8330e3be55794878cefb53f62266c9a029d (diff) | |
merge changes for storm-1210
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; |