diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-12-05 09:36:41 -0800 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-05 09:36:41 -0800 |
commit | 837e4e5165cc3e6595577e90bae240e676be8ffe (patch) | |
tree | 85c8e8a8cb6adf8abc87fe3a70d4513a1ab625e5 /indra/newview/llviewerobject.cpp | |
parent | 570d02dc7e41c3e08477e7f759d632db78690eb4 (diff) | |
parent | 71974461114d81f818f69a4344ce4071c20f331f (diff) |
Merge with viewer-experience
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--[-rwxr-xr-x] | indra/newview/llviewerobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index d81e67bfe2..b8772971aa 100755..100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3219,12 +3219,12 @@ F32 LLViewerObject::getLinksetPhysicsCost() return mLinksetPhysicsCost; } -F32 LLViewerObject::getStreamingCost(S32* bytes, S32* visible_bytes) +F32 LLViewerObject::getStreamingCost(S32* bytes, S32* visible_bytes, F32* unscaled_value) const { return 0.f; } -U32 LLViewerObject::getTriangleCount() +U32 LLViewerObject::getTriangleCount(S32* vcount) const { return 0; } |