diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-01 13:57:51 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-01 13:57:51 -0400 |
| commit | 17edcc939a49d36415d3cfdd9b8c213ebb83a537 (patch) | |
| tree | 2ea7d88d6432407aeb33664ee4b02109069d4bc7 /indra/newview/llmanipscale.cpp | |
| parent | 4b7793a119f4e4c8c4f03b6ff9adb0eb6fe94209 (diff) | |
| parent | 6bc63bddeede375c6ea03c299b267559a3fca0fb (diff) | |
merged .hgtags
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; |