Revert "Merge pull request #5829 from secondlife/geenz/texture-quality"

This reverts commit 6b4e3f3288ec1e9917cecd862a7a52945e5b4db2, reversing
changes made to 99ab6316b4ae9058f22d9f57d21e795ca45797fd.

1 files changed, 2 insertions, 12 deletions

diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp
index fe77d585c8..64359b6cbe 100644
--- a/indra/newview/llsurface.cpp
+++ b/indra/newview/llsurface.cpp
@@ -57,8 +57,6 @@ namespace
 LLColor4U MAX_WATER_COLOR(0, 48, 96, 240);
 
 S32 LLSurface::sTextureSize = 256;
-F32 LLSurface::sNearestVisiblePatchDistance = FLT_MAX;
-U32 LLSurface::sNearestVisiblePatchFrame = 0;
 
 // ---------------- LLSurface:: Public Members ---------------
 
@@ -124,7 +122,7 @@ LLSurface::~LLSurface()
     else if (poolp->mReferences.empty())
     {
         gPipeline.removePool(poolp);
-        // Don't enable this until we blitz the draw pool for it as well.  - djs
+        // Don't enable this until we blitz the draw pool for it as well.  -- djs
         mSTexturep = nullptr;
     }
     else
@@ -585,13 +583,6 @@ void LLSurface::updatePatchVisibilities(LLAgent &agent)
 
     LLSurfacePatch *patchp;
 
-    // Reset the cross-region accumulator at the start of each frame.
-    if (sNearestVisiblePatchFrame != gFrameCount)
-    {
-        sNearestVisiblePatchDistance = FLT_MAX;
-        sNearestVisiblePatchFrame = gFrameCount;
-    }
-
     mVisiblePatchCount = 0;
     for (S32 i=0; i<mNumberOfPatches; i++)
     {
@@ -602,7 +593,6 @@ void LLSurface::updatePatchVisibilities(LLAgent &agent)
         {
             mVisiblePatchCount++;
             patchp->updateCameraDistanceRegion(pos_region);
-            sNearestVisiblePatchDistance = llmin(sNearestVisiblePatchDistance, patchp->getDistance());
         }
     }
 }
@@ -971,7 +961,7 @@ std::ostream& operator<<(std::ostream &s, const LLSurface &S)
 void LLSurface::createPatchData()
 {
     // Assumes mGridsPerEdge, mGridsPerPatchEdge, and mPatchesPerEdge have been properly set
-    // TODO - check for create() called when surface is not empty
+    // TODO -- check for create() called when surface is not empty
     S32 i, j;
     LLSurfacePatch *patchp;