summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-03-30 18:41:34 -0500
committerDave Parks <davep@lindenlab.com>2011-03-30 18:41:34 -0500
commit3a08499572250b46d061106298e2d2777276efc1 (patch)
tree31dbbd5e3465ca388f21c08e1cec0058f91608c0 /indra/newview/llviewerobject.cpp
parent9d28f8401d5b0d5772bb6e45dc2f9d136e9b9bbb (diff)
parent6b9a2d24cce8efaa72c2fd60655998844394312d (diff)
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index bcdc774c5e..70b1809033 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3134,7 +3134,7 @@ F32 LLViewerObject::getLinksetPhysicsCost()
return mLinksetPhysicsCost;
}
-F32 LLViewerObject::getStreamingCost()
+F32 LLViewerObject::getStreamingCost(S32* bytes, S32* visible_bytes)
{
return 0.f;
}