summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-11-28 11:02:15 -0500
committerOz Linden <oz@lindenlab.com>2011-11-28 11:02:15 -0500
commitd22584bfe51c034076d9e8df01f70628abc22f85 (patch)
treeb635b0e89ae9957659da1e96944b99941a4f9dc7 /indra/newview/llviewerobject.h
parentb69be18d7b41b639d3c62354ca7ab6e3bc32f1cb (diff)
parent5374e544ed5888548bea334bd8ca7ca53372d031 (diff)
merge changes for vmrg-193
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rw-r--r--indra/newview/llviewerobject.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 9815d3311b..c8152e1539 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -340,7 +340,6 @@ public:
virtual void setScale(const LLVector3 &scale, BOOL damped = FALSE);
- virtual F32 getStreamingCost(S32* bytes = NULL, S32* visible_bytes = NULL, F32* unscaled_value = NULL) const;
virtual F32 getStreamingCost(S32* bytes = NULL, S32* visible_bytes = NULL, F32* unscaled_value = NULL) const;
virtual U32 getTriangleCount(S32* vcount = NULL) const;
virtual U32 getHighLODTriangleCount();