summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/llviewerobject.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 1e28aa6fb4..9f6de781b4 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1119,6 +1119,7 @@ Tofu Buzzard
VWR-24509
STORM-1684
SH-2477
+ STORM-1684
Tony Kembia
Torben Trautman
TouchaHoney Perhaps
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();