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.h | |
| parent | d145cbf37100d50ac6fc15c6009cb496615ed7fb (diff) | |
| parent | 7ee4c04365407920fb938311e3c237f7af687cc4 (diff) | |
merge changes for vmrg-188
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 53e951e483..be5b9819b1 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -340,7 +340,7 @@ public: virtual void setScale(const LLVector3 &scale, BOOL damped = FALSE); - virtual F32 getStreamingCost(S32* bytes = NULL, S32* visible_bytes = NULL); + virtual F32 getStreamingCost(S32* bytes = NULL, S32* visible_bytes = NULL, F32* unscaled_value = NULL) const; virtual U32 getTriangleCount(); virtual U32 getHighLODTriangleCount(); |