livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-5385; Make sure deleteing animation data does not cause memory corruption.

master
Nicky 2012-11-23 13:59:32 +01:00
parent bd1245f878
commit 1fc009104e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llcharacter/llkeyframemotion.cpp
View File

@ -2267,8 +2267,16 @@ void LLKeyframeDataCache::removeKeyframeData(const LLUUID& id)
keyframe_data_map_t::iterator found_data = sKeyframeDataMap.find(id);
if (found_data != sKeyframeDataMap.end())
{
delete found_data->second.mList;
// <FS:ND> FIRE-5385; Do not delete data directory, instead move it into the garbabe queue, so it gets deleted once no one holds a reference anymore.
// Otherwise it leeads to memory corruption etc.
// delete found_data->second.mList;
// sKeyframeDataMap.erase(found_data);
mGarbage.push_back( found_data->second.mList );
sKeyframeDataMap.erase(found_data);
// </FS:ND>
}
tryShrinkCache();