diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-08-06 14:42:47 +0300 | 
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-08-06 14:43:18 +0300 | 
| commit | 0f68bcd46ca3f2babf94303b80e2be006e4693ae (patch) | |
| tree | 585b23741341b3f671ee822e11c648ceae4f723d | |
| parent | 819817f5c9cebad353f5b86996b5426095dd73b8 (diff) | |
Revert "#4400 Model Import "use lod above" was not updating"
This reverts commit e05b32a0305f57573236c12dc4c1fbeecf2878ed.
Looks like I had a better fix in 2025.06
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 2 | 
2 files changed, 5 insertions, 13 deletions
| diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 332a98031f..5aef7f20b4 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -165,7 +165,7 @@ bool LLFloaterModelPreview::postBuild()      for (S32 lod = 0; lod <= LLModel::LOD_HIGH; ++lod)      {          LLComboBox* lod_source_combo = getChild<LLComboBox>("lod_source_" + lod_name[lod]); -        lod_source_combo->setCommitCallback(boost::bind(&LLFloaterModelPreview::onLoDSourceCommit, this, lod, true)); +        lod_source_combo->setCommitCallback(boost::bind(&LLFloaterModelPreview::onLoDSourceCommit, this, lod));          lod_source_combo->setCurrentByIndex(mLODMode[lod]);          getChild<LLButton>("lod_browse_" + lod_name[lod])->setCommitCallback(boost::bind(&LLFloaterModelPreview::onBrowseLOD, this, lod)); @@ -766,7 +766,7 @@ void LLFloaterModelPreview::onLODParamCommit(S32 lod, bool enforce_tri_limit)          LLComboBox* lod_source_combo = getChild<LLComboBox>("lod_source_" + lod_name[i]);          if (lod_source_combo->getCurrentIndex() == LLModelPreview::USE_LOD_ABOVE)          { -            onLoDSourceCommit(i, false); +            onLoDSourceCommit(i);          }          else          { @@ -1760,7 +1760,7 @@ void LLFloaterModelPreview::toggleCalculateButton(bool visible)      }  } -void LLFloaterModelPreview::onLoDSourceCommit(S32 lod, bool refresh_ui) +void LLFloaterModelPreview::onLoDSourceCommit(S32 lod)  {      mModelPreview->updateLodControls(lod); @@ -1769,17 +1769,9 @@ void LLFloaterModelPreview::onLoDSourceCommit(S32 lod, bool refresh_ui)      if (index == LLModelPreview::MESH_OPTIMIZER_AUTO          || index == LLModelPreview::MESH_OPTIMIZER_SLOPPY          || index == LLModelPreview::MESH_OPTIMIZER_PRECISE) -    { -        // rebuild LoD to update triangle counts +    { //rebuild LoD to update triangle counts          onLODParamCommit(lod, true);      } -    else if (refresh_ui && index == LLModelPreview::USE_LOD_ABOVE) -    { -        // Update mUploadData for updateStatusMessages -        mModelPreview->rebuildUploadData(); -        // Update UI with new triangle values -        mModelPreview->updateStatusMessages(); -    }  }  void LLFloaterModelPreview::resetDisplayOptions() diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 5d23dc8d8e..6adc084fe8 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -208,7 +208,7 @@ private:      void onClickCalculateBtn();      void onJointListSelection(); -    void onLoDSourceCommit(S32 lod, bool refresh_ui); +    void onLoDSourceCommit(S32 lod);      void modelUpdated(bool calculate_visible); | 
