Fix compile errors and warnings on linux after merging Shyotl.

This commit is contained in:
Lirusaito
2014-07-22 03:39:01 -04:00
parent 5191baa659
commit 41eb687243
8 changed files with 41 additions and 26 deletions

View File

@@ -1459,7 +1459,8 @@ void LLViewerObjectList::removeFromActiveList(LLViewerObject* objectp)
objectp->setListIndex(-1);
std::vector<LLPointer<LLViewerObject> >::iterator iter = vector_replace_with_last(mActiveObjects,mActiveObjects.begin() + idx);
std::vector<LLPointer<LLViewerObject> >::iterator it(mActiveObjects.begin() + idx);
std::vector<LLPointer<LLViewerObject> >::iterator iter = vector_replace_with_last(mActiveObjects, it);
if(iter != mActiveObjects.end())
(*iter)->setListIndex(idx);