Commits

Scott Lawrence committed 1343609 Merge

merge changes for vmrg-193

Comments (0)

Files changed (2)

doc/contributions.txt

 	VWR-24509
     STORM-1684
 	SH-2477
+	STORM-1684
 Tony Kembia
 Torben Trautman
 TouchaHoney Perhaps

indra/newview/llviewerobject.h

 	
 	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();