diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-04-03 19:13:23 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-04-03 19:13:23 -0500 |
| commit | 7be7c66b0e43baef64871dac278eac5726e28d25 (patch) | |
| tree | 4f695e1ade803f745a11aa9af70040d7a8103c1d /indra/newview/llviewerregion.cpp | |
| parent | 7c831d115b55b96129806353a51a01dcf2bcebba (diff) | |
SL-18458 Followup -- disable vocache unit test to unstick build, sanitize "object_id" to "local_id"
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index b159cc2750..d3ee6daa6f 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -2651,8 +2651,8 @@ LLViewerRegion::eCacheUpdateResult LLViewerRegion::cacheFullUpdate(LLViewerObjec void LLViewerRegion::cacheFullUpdateGLTFOverride(const LLGLTFOverrideCacheEntry &override_data) { - U32 object_id = override_data.mLocalId; - mImpl->mGLTFOverridesJson[object_id] = override_data; + U32 local_id = override_data.mLocalId; + mImpl->mGLTFOverridesJson[local_id] = override_data; } LLVOCacheEntry* LLViewerRegion::getCacheEntryForOctree(U32 local_id) |