diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-31 16:02:15 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-31 16:02:15 -0700 |
| commit | 17fc2e1f5b43a94985114722c1106bbc3332d33d (patch) | |
| tree | 11e7f066c2407d97a8962433e4a34415615fcc6e /indra/newview/llvovolume.cpp | |
| parent | 6896dd2f866e1a03d68d39f1cf32a66e080746ac (diff) | |
| parent | 8ccf3fbe3ba49c47da85527bcf6cdbded6fa9183 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 98e5e4c6de..7c4a4c13ba 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3082,15 +3082,15 @@ U32 LLVOVolume::getRenderCost(std::set<LLUUID> &textures) const }
-F32 LLVOVolume::getStreamingCost()
+F32 LLVOVolume::getStreamingCost(S32* bytes, S32* visible_bytes)
{
if (isMesh())
{
- const LLSD& header = gMeshRepo.getMeshHeader(getVolume()->getParams().getSculptID());
+ LLSD& header = gMeshRepo.getMeshHeader(getVolume()->getParams().getSculptID());
F32 radius = getScale().length();
- return LLMeshRepository::getStreamingCost(header, radius);
+ return LLMeshRepository::getStreamingCost(header, radius, bytes, visible_bytes, mLOD);
}
return 0.f;
|