diff options
author | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
commit | 706ec08deb3feaea9c5c3516dea657b86b0474c3 (patch) | |
tree | a918eac8a10e43b78d156cb0620520420f0dfc62 /indra/newview/llvotree.cpp | |
parent | d2bb4dae980a887a30b206875d8f9419901ed66a (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Merged in viewer-release
Diffstat (limited to 'indra/newview/llvotree.cpp')
-rwxr-xr-x | indra/newview/llvotree.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp index cd12cd9552..b82c4fe769 100755 --- a/indra/newview/llvotree.cpp +++ b/indra/newview/llvotree.cpp @@ -269,6 +269,7 @@ void LLVOTree::initClass() void LLVOTree::cleanupClass() { std::for_each(sSpeciesTable.begin(), sSpeciesTable.end(), DeletePairedPointer()); + sSpeciesTable.clear(); } U32 LLVOTree::processUpdateMessage(LLMessageSystem *mesgsys, @@ -339,7 +340,7 @@ U32 LLVOTree::processUpdateMessage(LLMessageSystem *mesgsys, return retval; } -void LLVOTree::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) +void LLVOTree::idleUpdate(LLAgent &agent, const F64 &time) { if (mDead || !(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_TREE))) { |