diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-09-15 19:02:18 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-09-15 19:02:18 -0400 |
| commit | c5d880ff141f2ffb61b210790f727b8373142e8b (patch) | |
| tree | fa32d8eececbc8f16470d4c5946b0ff770e1afa7 /indra/newview/llviewerobject.cpp | |
| parent | 4b269f67ea8d053b4c05a9c002811901c8ec8a49 (diff) | |
| parent | e6da5a4bbaaefa81a058087ddc567caa459b58b7 (diff) | |
Automated merge with https://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index d20b6641d3..c5c841d666 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3217,7 +3217,7 @@ 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; } |