livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for vmrg-193

meow-7.2.2
Oz Linden 2011-11-28 11:02:15 -05:00
parent b69be18d7b 5374e544ed
commit d22584bfe5
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -1119,6 +1119,7 @@ Tofu Buzzard
VWR-24509
STORM-1684
SH-2477
STORM-1684
Tony Kembia
Torben Trautman
TouchaHoney Perhaps

1
indra/newview/llviewerobject.h
View File

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