diff --git a/doc/contributions.txt b/doc/contributions.txt
index 1e28aa6fb4d3f7ac51dd0b0bda171a42cca4c321..9f6de781b41b8f707ed3833960349dc461a087fb 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 9815d3311b5dfbc241824dd5d16a6c1c3e85ba77..c8152e1539db7e447b8c5664e7d2f349802f733d 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -340,7 +340,6 @@ class LLViewerObject : public LLPrimitive, public LLRefCount, public LLGLUpdate
 	
 	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();