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/llsurface.cpp | |
parent | b0c449d301299a4ba1b7d83e930f9df6b071b931 (diff) | |
parent | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff) |
viewer-development merge
Diffstat (limited to 'indra/newview/llsurface.cpp')
-rw-r--r-- | indra/newview/llsurface.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp index f64a72a616..ec11a23eb8 100644 --- a/indra/newview/llsurface.cpp +++ b/indra/newview/llsurface.cpp @@ -62,8 +62,6 @@ LLColor4U MAX_WATER_COLOR(0, 48, 96, 240); S32 LLSurface::sTextureSize = 256; -S32 LLSurface::sTexelsUpdated = 0; -F32 LLSurface::sTextureUpdateTime = 0.f; // ---------------- LLSurface:: Public Members --------------- @@ -647,7 +645,6 @@ void LLSurface::updatePatchVisibilities(LLAgent &agent) BOOL LLSurface::idleUpdate(F32 max_update_time) { - LLMemType mt_ius(LLMemType::MTYPE_IDLE_UPDATE_SURFACE); if (!gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_TERRAIN)) { return FALSE; |