diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-09-17 13:07:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-17 13:07:01 -0500 |
| commit | fd843d514a4e28f8e4a5d5595bba21ccad195e72 (patch) | |
| tree | a2b9e7fd908481c5892046594faed0e07b800a12 | |
| parent | 870ffbd55b4ffdfad27edf8824de0c9cbc577a80 (diff) | |
Mac pass (#2587)
| -rw-r--r-- | indra/cmake/Tracy.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake index d54a32fdc2..ec7178c5a0 100644 --- a/indra/cmake/Tracy.cmake +++ b/indra/cmake/Tracy.cmake @@ -6,7 +6,7 @@ add_library( ll::tracy INTERFACE IMPORTED ) # default Tracy profiling on for test builds, but off for all others string(TOLOWER ${VIEWER_CHANNEL} channel_lower) -if(WINDOWS AND channel_lower MATCHES "^second life test") +if(channel_lower MATCHES "^second life test") option(USE_TRACY "Use Tracy profiler." ON) else() option(USE_TRACY "Use Tracy profiler." OFF) diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 532a87bbd1..1f214344ff 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3900,6 +3900,7 @@ void LLMeshRepository::notifyLoadedMeshes() for (auto iter = mSkinMap.begin(), ender = mSkinMap.end(); iter != ender;) { auto copy_iter = iter++; + LLUUID id = copy_iter->first; //skinbytes += U64Bytes(sizeof(LLMeshSkinInfo)); //skinbytes += U64Bytes(copy_iter->second->mJointNames.size() * sizeof(std::string)); @@ -3913,7 +3914,6 @@ void LLMeshRepository::notifyLoadedMeshes() } // erase from background thread - LLUUID id = iter->first; mThread->mWorkQueue.post([=]() { mThread->mSkinMap.erase(id); |