diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-19 11:38:02 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-19 11:38:02 -0500 |
commit | 0752cc07921664af2e13588b1aaaf3c47546e3be (patch) | |
tree | 697d8f9b5384e76a333a6a16f758198e5b33ef07 /indra/newview/llviewerregion.cpp | |
parent | f21666bd9a4fe35b325c23c4b46076be24016bfc (diff) | |
parent | 586e4cd090b22f11a68fa635e598847ce3b84d21 (diff) |
DRTVWR-601: Merge branch 'release/gltf-maint2' into DRTVWR-601-gha-libs
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-x | indra/newview/llviewerregion.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 452dcdd8fd..60862ae5bd 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1879,8 +1879,6 @@ LLViewerObject* LLViewerRegion::addNewObject(LLVOCacheEntry* entry) addActiveCacheEntry(entry); } - loadCacheMiscExtras(entry->getLocalID()); - return obj; } @@ -3655,15 +3653,6 @@ std::string LLViewerRegion::getSimHostName() return std::string("..."); } -void LLViewerRegion::loadCacheMiscExtras(U32 local_id) -{ - auto iter = mImpl->mGLTFOverridesLLSD.find(local_id); - if (iter != mImpl->mGLTFOverridesLLSD.end()) - { - LLGLTFMaterialList::loadCacheOverrides(iter->second); - } -} - void LLViewerRegion::applyCacheMiscExtras(LLViewerObject* obj) { LL_PROFILE_ZONE_SCOPED_CATEGORY_DISPLAY; |