summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2011-06-09 14:30:53 -0700
committerRoxie Linden <roxie@lindenlab.com>2011-06-09 14:30:53 -0700
commit37a3b0d75392836034955a9d00ac1d8a6db20473 (patch)
tree579e069436e1b12e7aec3a3ca8cae17886e2f8de /indra
parent557c9be005b89663f227ecf4aa0fec9505a5da41 (diff)
Remove ObjectAdd cap, no longer needed
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llmanipscale.cpp1
-rw-r--r--indra/newview/llviewerregion.cpp1
2 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index 0eedabb5de..4eb94dfb8e 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -92,7 +92,6 @@ 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 (gMeshRepo.meshRezEnabled() &&
- !gAgent.getRegion()->getCapability("ObjectAdd").empty() &&
!is_flora)
{
return DEFAULT_MAX_PRIM_SCALE;
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index f3fb4b82ad..002e0567e4 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1526,7 +1526,6 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
capabilityNames.append("MapLayer");
capabilityNames.append("MapLayerGod");
capabilityNames.append("NewFileAgentInventory");
- capabilityNames.append("ObjectAdd");
capabilityNames.append("ParcelPropertiesUpdate");
capabilityNames.append("ParcelMediaURLFilterList");
capabilityNames.append("ParcelNavigateMedia");