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

@@ -49,7 +49,8 @@ LLViewerTextureAnim::LLViewerTextureAnim(LLVOVolume* vobj) : LLTextureAnim()
LLViewerTextureAnim::~LLViewerTextureAnim()
{
std::vector<LLViewerTextureAnim*>::iterator iter = vector_replace_with_last(sInstanceList, sInstanceList.begin() + mInstanceIndex);
std::vector<LLViewerTextureAnim*>::iterator it(sInstanceList.begin() + mInstanceIndex);
std::vector<LLViewerTextureAnim*>::iterator iter = vector_replace_with_last(sInstanceList, it);
if(iter != sInstanceList.end())
(*iter)->mInstanceIndex = mInstanceIndex;
}