diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-21 13:11:09 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-21 13:11:09 -0500 |
| commit | 78a0cf4cdd63353a694cbf3f21783dc3e8deb31c (patch) | |
| tree | ab09f86c3a0c15b5152cc2df17a4e0751306e11d /indra/newview/llviewerobject.cpp | |
| parent | d145cbf37100d50ac6fc15c6009cb496615ed7fb (diff) | |
| parent | 7ee4c04365407920fb938311e3c237f7af687cc4 (diff) | |
merge changes for vmrg-188
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; } |