diff options
author | Baker Linden <baker@lindenlab.com> | 2013-01-09 15:25:06 -0800 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2013-01-09 15:25:06 -0800 |
commit | c4a1bd1c2f2e8da202c59d756e5d49b273e5145c (patch) | |
tree | 96f3ccbb2c5d534f021052fafab97bedd6d57e91 /indra/newview/llvlcomposition.cpp | |
parent | b0c449d301299a4ba1b7d83e930f9df6b071b931 (diff) | |
parent | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff) |
viewer-development merge
Diffstat (limited to 'indra/newview/llvlcomposition.cpp')
-rw-r--r-- | indra/newview/llvlcomposition.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llvlcomposition.cpp b/indra/newview/llvlcomposition.cpp index ec932501e5..abb5153480 100644 --- a/indra/newview/llvlcomposition.cpp +++ b/indra/newview/llvlcomposition.cpp @@ -457,8 +457,6 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y, texturep->createGLTexture(0, raw); } texturep->setSubImage(raw, tex_x_begin, tex_y_begin, tex_x_end - tex_x_begin, tex_y_end - tex_y_begin); - LLSurface::sTextureUpdateTime += gen_timer.getElapsedTimeF32(); - LLSurface::sTexelsUpdated += (tex_x_end - tex_x_begin) * (tex_y_end - tex_y_begin); for (S32 i = 0; i < 4; i++) { |