diff options
author | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
commit | 1b550aaec246063090fe7143145d69eebfbd4680 (patch) | |
tree | 66b1d7c9f424e0183c5488037fcdae3a37916955 /indra/newview/pipeline.h | |
parent | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (diff) |
EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r-- | indra/newview/pipeline.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 583f40e93d..8b64b63016 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -349,19 +349,12 @@ public: BOOL mBackfaceCull; S32 mTrianglesDrawn; LLStat mTrianglesDrawnStat; - LLStat mCompilesStat; S32 mVerticesRelit; - LLStat mVerticesRelitStat; S32 mLightingChanges; - LLStat mLightingChangesStat; S32 mGeometryChanges; - LLStat mGeometryChangesStat; - LLStat mMoveChangesStat; S32 mNumVisibleFaces; - LLStat mNumVisibleFacesStat; - LLStat mNumVisibleDrawablesStat; static S32 sCompiles; |