diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 00:14:56 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 00:14:56 +0200 |
commit | 78174fc8658caeddfd8306ec19eb0e1c2975368e (patch) | |
tree | 0948d578f384fbd247eefd2dff771a9cd8cbd8c1 /indra/newview/llviewerobject.cpp | |
parent | 689ef9442581d7af8ff0e0264be4919fe6cffd73 (diff) | |
parent | 9567393f803dfb0c786b8e917e41c8f4b8b22af7 (diff) |
Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
# Conflicts:
# .github/workflows/build.yaml
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r-- | indra/newview/llviewerobject.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index fc055a7303..f1fac106c7 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5051,11 +5051,6 @@ void LLViewerObject::updateTEMaterialTextures(U8 te) LLViewerObject* obj = gObjectList.findObject(id); if (obj) { - LLViewerRegion* region = obj->getRegion(); - if(region) - { - region->loadCacheMiscExtras(obj->getLocalID()); - } obj->markForUpdate(); } }); |