SL-17121 Revert "SL-15940 Remove ability to set zero triangle limit"

This reverts commit b45c0e3ed926270e100271f33885b8d31085a858.

2 files changed, 1 insertions, 10 deletions

diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index c7f56de4ed..8bf88cb5e8 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -180,7 +180,6 @@ LLModelPreview::LLModelPreview(S32 width, S32 height, LLFloater* fmp)
     mPreviewLOD = 0;
     mModelLoader = NULL;
     mMaxTriangleLimit = 0;
-    mMinTriangleLimit = 0;
     mDirty = false;
     mGenLOD = false;
     mLoading = false;
@@ -1643,7 +1642,6 @@ void LLModelPreview::genMeshOptimizerLODs(S32 which_lod, S32 meshopt_mode, U32 d
     }
 
     mMaxTriangleLimit = base_triangle_count;
-    mMinTriangleLimit = mBaseModel.size();
 
     // Build models
 
@@ -1668,7 +1666,7 @@ void LLModelPreview::genMeshOptimizerLODs(S32 which_lod, S32 meshopt_mode, U32 d
             }
         }
 
-        mRequestedTriangleCount[lod] = llmax(mMinTriangleLimit, (S32)triangle_limit);
+        mRequestedTriangleCount[lod] = triangle_limit;
         mRequestedErrorThreshold[lod] = lod_error_threshold;
         mRequestedLoDMode[lod] = lod_mode;
 
@@ -2003,7 +2001,6 @@ void LLModelPreview::updateStatusMessages()
     if (mMaxTriangleLimit == 0)
     {
         mMaxTriangleLimit = total_tris[LLModel::LOD_HIGH];
-        mMinTriangleLimit = mUploadData.size();
     }
 
     mHasDegenerate = false;
@@ -2506,7 +2503,6 @@ void LLModelPreview::updateLodControls(S32 lod)
         LLSpinCtrl* limit = mFMP->getChild<LLSpinCtrl>("lod_triangle_limit_" + lod_name[lod]);
 
         limit->setMaxValue(mMaxTriangleLimit);
-        limit->setMinValue(mMinTriangleLimit);
         limit->forceSetValue(mRequestedTriangleCount[lod]);
 
         threshold->forceSetValue(mRequestedErrorThreshold[lod]);
@@ -2519,7 +2515,6 @@ void LLModelPreview::updateLodControls(S32 lod)
             threshold->setVisible(false);
 
             limit->setMaxValue(mMaxTriangleLimit);
-            limit->setMinValue(mMinTriangleLimit);
             limit->setIncrement(llmax((U32)1, mMaxTriangleLimit / 32));
         }
         else
diff --git a/indra/newview/llmodelpreview.h b/indra/newview/llmodelpreview.h
index f78f476810..9e32215e6a 100644
--- a/indra/newview/llmodelpreview.h
+++ b/indra/newview/llmodelpreview.h
@@ -290,10 +290,6 @@ protected:
     // Amount of triangles in original(base) model
     U32 mMaxTriangleLimit;
 
-    // Minimum amount of allowed triangles in lod for spin cntrl.
-    // Leave at least one triangle per model.
-    S32 mMinTriangleLimit;
-
     LLMeshUploadThread::instance_list mUploadData;
     std::set<LLViewerFetchedTexture * > mTextureSet;