diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-20 14:45:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-20 14:45:47 -0400 |
| commit | c2e902d56ac5d6b6109c1b12254c62ec18ad2199 (patch) | |
| tree | eccb10bb1f2a558270fef9faa87ef1333e2f501a /indra/newview/llpathfindingobjectlist.cpp | |
| parent | 7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff) | |
| parent | 2d28bc112a2db73b521d44e12b3c633cf8eccd7e (diff) | |
merge back beta fixes
Diffstat (limited to 'indra/newview/llpathfindingobjectlist.cpp')
| -rw-r--r-- | indra/newview/llpathfindingobjectlist.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llpathfindingobjectlist.cpp b/indra/newview/llpathfindingobjectlist.cpp index 68a7e736e6..f1ecb45fc0 100644 --- a/indra/newview/llpathfindingobjectlist.cpp +++ b/indra/newview/llpathfindingobjectlist.cpp @@ -45,6 +45,7 @@ LLPathfindingObjectList::LLPathfindingObjectList() LLPathfindingObjectList::~LLPathfindingObjectList() { + clear(); } bool LLPathfindingObjectList::isEmpty() const @@ -52,6 +53,15 @@ bool LLPathfindingObjectList::isEmpty() const return mObjectMap.empty(); } +void LLPathfindingObjectList::clear() +{ + for (LLPathfindingObjectMap::iterator objectIter = mObjectMap.begin(); objectIter != mObjectMap.end(); ++objectIter) + { + objectIter->second.reset(); + } + mObjectMap.clear(); +} + void LLPathfindingObjectList::update(LLPathfindingObjectPtr pUpdateObjectPtr) { if (pUpdateObjectPtr != NULL) |