Skip to content

#4297 Crash on LLVOCache::writeToCache #4495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 6, 2025
Merged

#4297 Crash on LLVOCache::writeToCache #4495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e12ba9
#4297 Crash on LLVOCache::writeToCache
akleshchev Aug 6, 2025
4cf0c78
#4470 Hide discord panel when set to build without discord
akleshchev Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion indra/newview/llfloaterpreference.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,8 @@ bool LLFloaterPreference::postBuild()
}

#ifndef LL_DISCORD
getChild<LLTabContainer>("privacy_tab_container")->childDisable("privacy_preferences_discord");
LLPanel* panel = getChild<LLPanel>("privacy_preferences_discord");
getChild<LLTabContainer>("privacy_tab_container")->removeTabPanel(panel);
#endif

return true;
Expand Down
8 changes: 4 additions & 4 deletions indra/newview/llvocache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1875,11 +1875,11 @@ void LLVOCache::removeGenericExtrasForHandle(U64 handle)
}

// NOTE: when removing the extras, we must also remove the objects so the simulator will send us a full upddate with the valid overrides
auto* entry = mHandleEntryMap[handle];
if (entry)
handle_entry_map_t::iterator iter = mHandleEntryMap.find(handle);
if (iter != mHandleEntryMap.end())
{
LL_WARNS("GLTF", "VOCache") << "Removing generic extras for handle " << entry->mHandle << "Filename: " << getObjectCacheExtrasFilename(handle) << LL_ENDL;
removeEntry(entry);
LL_WARNS("GLTF", "VOCache") << "Removing generic extras for handle " << handle << "Filename: " << getObjectCacheExtrasFilename(handle) << LL_ENDL;
removeEntry(iter->second);
}
else
{
Expand Down
Loading