SL-18458 Followup -- disable vocache unit test to unstick build, sanitize "object_id" to "local_id"

2 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b197182009..3bc636bac4 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2212,7 +2212,7 @@ if (LL_TESTS)
 #    llremoteparcelrequest.cpp
     llviewerhelputil.cpp
     llversioninfo.cpp
-    llvocache.cpp
+#    llvocache.cpp  
     llworldmap.cpp
     llworldmipmap.cpp
   )
@@ -2226,12 +2226,12 @@ if (LL_TESTS)
     #llviewertexturelist.cpp
   )
 
-  set_source_files_properties(
-    llvocache.cpp
-    PROPERTIES
-    LL_TEST_ADDITIONAL_SOURCE_FILES ../llmessage/lldatapacker.cpp
-    LL_TEST_ADDITIONAL_PROJECTS "llprimitive"
-  )
+#  set_source_files_properties(
+#    llvocache.cpp
+#    PROPERTIES
+#    LL_TEST_ADDITIONAL_SOURCE_FILES ../llmessage/lldatapacker.cpp
+#    LL_TEST_ADDITIONAL_PROJECTS "llprimitive"
+#  )
 
   set(test_libs
           llcommon
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)