diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-08 09:45:27 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-08 09:45:27 -0500 |
| commit | a7dbaaa0af643fc5bce0b740a92e69dfb931c6e8 (patch) | |
| tree | 3eddbd3f421f430c9b03487261e89c95017657b9 /indra/newview/llsurface.cpp | |
| parent | 0d12d171cf20c63a45e7ad0989e65d05aabb86ea (diff) | |
| parent | 77abdd04a4a390049c2143e1d87542b9b2a06c86 (diff) | |
merge changes for DRTVWR-250
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; |