diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-01-24 10:14:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 10:14:59 -0800 |
| commit | c22aefafb3d05be37965361913c02568fa10adf6 (patch) | |
| tree | 575757798bdf15d9c58e8e17e5f170de2e074b7a /indra/newview/llfetchedgltfmaterial.cpp | |
| parent | 2adecc6fac9852974e44e3d58ccf2619b45642a9 (diff) | |
| parent | 7b0372ac1f6191ef9216296cef2f476caadee40c (diff) | |
Merge pull request #657 from secondlife/DRTVWR-592
Merge PBR terrain and put PBR terrain behind feature flag.
Diffstat (limited to 'indra/newview/llfetchedgltfmaterial.cpp')
| -rw-r--r-- | indra/newview/llfetchedgltfmaterial.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfetchedgltfmaterial.cpp b/indra/newview/llfetchedgltfmaterial.cpp index 90ec08391d..97b959e5cb 100644 --- a/indra/newview/llfetchedgltfmaterial.cpp +++ b/indra/newview/llfetchedgltfmaterial.cpp @@ -37,8 +37,6 @@ LLFetchedGLTFMaterial::LLFetchedGLTFMaterial() : LLGLTFMaterial() , mExpectedFlusTime(0.f) - , mActive(true) - , mFetching(false) { } @@ -242,10 +240,11 @@ void LLFetchedGLTFMaterial::onMaterialComplete(std::function<void()> material_co materialCompleteCallbacks.push_back(material_complete); } -void LLFetchedGLTFMaterial::materialComplete() +void LLFetchedGLTFMaterial::materialComplete(bool success) { llassert(mFetching); mFetching = false; + mFetchSuccess = success; for (std::function<void()> material_complete : materialCompleteCallbacks) { |