Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/Shyotl/singularityviewer-internal

Browse Source 
Conflicts:
	indra/newview/llnetmap.cpp - Thankies Shyotl~
This commit is contained in:
Inusaito Sayori
2014-07-21 23:31:59 -04:00
parent 8159eff664 cd85afc9a5
commit 5191baa659
111 changed files with 2419 additions and 3960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llviewerobjectlist.cpp
View File

@@ -1459,15 +1459,10 @@ void LLViewerObjectList::removeFromActiveList(LLViewerObject* objectp)
objectp->setListIndex(-1);
S32 last_index = mActiveObjects.size()-1;
std::vector<LLPointer<LLViewerObject> >::iterator iter = vector_replace_with_last(mActiveObjects,mActiveObjects.begin() + idx);
if(iter != mActiveObjects.end())
(*iter)->setListIndex(idx);
if (idx != last_index)
{
mActiveObjects[idx] = mActiveObjects[last_index];
mActiveObjects[idx]->setListIndex(idx);
}
mActiveObjects.pop_back();
}
}