diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-22 09:50:29 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-22 09:50:29 -0500 |
commit | 810a00469aa307fcf028b4b434080dba307c392a (patch) | |
tree | 5dc2dd20bef848dbc3b60bcdba21749c381bde40 /indra/newview/llviewerobject.cpp | |
parent | 4b0d2f8209f496f90e2c13643b0307a86797bdb2 (diff) | |
parent | 82057f29720ec5daf95bfd915a75b4dfbc046422 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rwxr-xr-x | 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 d81e67bfe2..46e4fc3b02 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3219,7 +3219,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; } |