summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-04-19 12:37:27 -0500
committerDave Parks <davep@lindenlab.com>2011-04-19 12:37:27 -0500
commit12b0b52b99e6f6a6538feba8589566d2f73f82c6 (patch)
treeb4053044a9d9f95aa7fea445ce8873ae744f74b1 /indra/newview/llviewerobject.cpp
parent3cb97cb4d75c40d9519d796dd52d0741d354fc97 (diff)
parentc494e5c0d55b2da2f5aa5ea18fbccb670b2f3107 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 70b1809033..a5b59e8281 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -240,6 +240,9 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
mState(0),
mMedia(NULL),
mClickAction(0),
+ mObjectCost(0),
+ mLinksetCost(0),
+ mPhysicsCost(0),
mLinksetPhysicsCost(0.f),
mCostStale(true),
mPhysicsShapeUnknown(true),
@@ -3144,6 +3147,11 @@ U32 LLViewerObject::getTriangleCount()
return 0;
}
+U32 LLViewerObject::getHighLODTriangleCount()
+{
+ return 0;
+}
+
void LLViewerObject::updateSpatialExtents(LLVector4a& newMin, LLVector4a &newMax)
{
LLVector4a center;