diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-07-03 17:42:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-03 17:42:24 -0500 |
| commit | 08b933a0c67463f06f124420f16c8a3f7dc83f1f (patch) | |
| tree | 4ca6d47a6b055d332cb75646226c13e950f37ce4 /indra/newview/gltfscenemanager.cpp | |
| parent | 9a38ecee8ef54b3e85a88657d7ba96c3292e350e (diff) | |
#1870 Tune up for better experience on integrated intel with low memory (#1872)
* More deterministic vsize calculation. Add control for choosing downscale method.
* Quick hack to make GLTF preview work again
Diffstat (limited to 'indra/newview/gltfscenemanager.cpp')
| -rw-r--r-- | indra/newview/gltfscenemanager.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/gltfscenemanager.cpp b/indra/newview/gltfscenemanager.cpp index b161ec8492..58179f9dc3 100644 --- a/indra/newview/gltfscenemanager.cpp +++ b/indra/newview/gltfscenemanager.cpp @@ -345,6 +345,12 @@ void GLTFSceneManager::addGLTFObject(LLViewerObject* obj, LLUUID gltf_id) llassert(obj->getVolume()->getParams().getSculptID() == gltf_id); llassert(obj->getVolume()->getParams().getSculptType() == LL_SCULPT_TYPE_GLTF); + if (obj->mGLTFAsset) + { // object already has a GLTF asset, don't reload it + llassert(std::find(mObjects.begin(), mObjects.end(), obj) != mObjects.end()); + return; + } + obj->ref(); gAssetStorage->getAssetData(gltf_id, LLAssetType::AT_GLTF, onGLTFLoadComplete, obj); } |