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/llviewerobject.h | |
parent | 6896dd2f866e1a03d68d39f1cf32a66e080746ac (diff) | |
parent | 8ccf3fbe3ba49c47da85527bcf6cdbded6fa9183 (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rw-r--r-- | indra/newview/llviewerobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 2b2b7bd59d..44f46b8c0f 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -326,7 +326,7 @@ public: virtual void setScale(const LLVector3 &scale, BOOL damped = FALSE); - virtual F32 getStreamingCost(); + virtual F32 getStreamingCost(S32* bytes = NULL, S32* visible_bytes = NULL); virtual U32 getTriangleCount(); void setObjectCost(F32 cost); |