diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-03-23 16:51:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-03-23 16:54:13 -0700 |
| commit | cf3a0c77f1855aa1a33ff39f86e846e7fb9031d1 (patch) | |
| tree | 2056e852b3a8923c285f8e6d2ee15e74a1071fca /indra/newview/llviewerregion.h | |
| parent | b72c66ae688c5b5c90ea7675fc65aeefbf6b87fc (diff) | |
Fix for SL-18458 overrides not applying when cache load happened before LLViewerObject::updateTEMaterialTextures call
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | indra/newview/llviewerregion.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index ec507fb982..b132a3a5f3 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -423,9 +423,9 @@ private: void decodeBoundingInfo(LLVOCacheEntry* entry); bool isNonCacheableObjectCreated(U32 local_id); - void loadCacheMiscExtras(U32 local_id, LLVOCacheEntry * entry, U32 crc); - public: + void loadCacheMiscExtras(U32 local_id); + struct CompareDistance { bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs) |