diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-21 15:28:25 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-21 15:28:25 -0500 |
| commit | 3212b741663e3cb8608bb432623968c568e626b5 (patch) | |
| tree | e913c151aae15738f8c0b173274126516c9b0739 /indra/newview/llviewerobject.cpp | |
| parent | b17c52d63ee159e071298ac0a8176a57a2e9b6de (diff) | |
| parent | 2f533950fccbbc37fbff65020201897999aaca04 (diff) | |
merge changes for storm-1634
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; } |