Added some nullchecks, removed some dead code, and cleaned up a few small things.

This commit is contained in:
Shyotl
2012-11-04 21:16:53 -06:00
parent dca9501de7
commit 71deb8925e
6 changed files with 33 additions and 24 deletions

View File

@@ -835,18 +835,15 @@ void LLViewerPartSim::removeLastCreatedSource()
void LLViewerPartSim::cleanupRegion(LLViewerRegion *regionp)
{
LLMemType mt(LLMemType::MTYPE_PARTICLES);
for (group_list_t::iterator i = mViewerPartGroups.begin(); i != mViewerPartGroups.end(); )
{
group_list_t::iterator iter = i++;
if ((*iter)->getRegion() == regionp)
group_list_t& vec = mViewerPartGroups;
for (group_list_t::size_type i = 0;i<vec.size();++i)
{
if (vec[i]->getRegion() == regionp)
{
delete *iter;
*iter = mViewerPartGroups.back();
bool done = (i == mViewerPartGroups.end());
mViewerPartGroups.pop_back();
if(done)
break;
delete vec[i];
vec[i--] = vec.back();
vec.pop_back();
//i = mViewerPartGroups.erase(iter);
}
}