diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:04:11 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:04:11 -0500 |
| commit | 37a8c12bd34b2bd119b50f32d6e081ab59d1f5c4 (patch) | |
| tree | ccdc7a5952a55dab7417251b248a25f6ca6fd530 /indra/newview/lldrawpool.cpp | |
| parent | b3fc9c79f559c84893dede3ce643ac0dfd1f3d65 (diff) | |
| parent | ad5a45624a702433d481c3dbc0f348a8755b367c (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
| -rw-r--r-- | indra/newview/lldrawpool.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index e3e66fa00d..a99b80d618 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -248,11 +248,6 @@ void LLFacePool::dirtyTextures(const std::set<LLViewerFetchedTexture*>& textures { } -BOOL LLFacePool::moveFace(LLFace *face, LLDrawPool *poolp, BOOL copy_data) -{ - return TRUE; -} - // static S32 LLFacePool::drawLoop(face_array_t& face_list) { @@ -474,6 +469,7 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture) { if (params.mTexture.notNull()) { + params.mTexture->addTextureStats(params.mVSize); gGL.getTexUnit(0)->bind(params.mTexture, TRUE) ; if (params.mTextureMatrix) { |