diff options
author | maxim@mnikolenko <maxim@mnikolenko> | 2013-01-31 19:25:42 +0200 |
---|---|---|
committer | maxim@mnikolenko <maxim@mnikolenko> | 2013-01-31 19:25:42 +0200 |
commit | 2ec0d24e4a0beac5afba992b37f97c30d972342b (patch) | |
tree | 55842c2c5238b75a70eb99c3356fe99196530dc7 /indra/newview/llsurface.cpp | |
parent | 8714b610149a5ae7b6f248023722f237c9336472 (diff) | |
parent | 22835e1ddb39341df26681dde8d22c673cc3940b (diff) |
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; |