diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-08-23 15:11:10 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-23 15:11:10 -0700 |
commit | 6d84272d38a4d09819ae03f4d967195ec3bd660b (patch) | |
tree | f020454f9144a769081e44ee7cd4acae7042394b /indra/newview/llpathfindingobjectlist.cpp | |
parent | ff95dd4a43fd888a9b7353abcbfa701e4844a3a5 (diff) | |
parent | fcfc686d9c4125c7bf35fcc97cb40b18dd9a4fc1 (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
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) |