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

Fix compile errors and warnings on linux after merging Shyotl.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llflexibleobject.cpp
View File

@@ -80,10 +80,12 @@ LLVolumeImplFlexible::LLVolumeImplFlexible(LLViewerObject* vo, LLFlexibleObjectD
LLVolumeImplFlexible::~LLVolumeImplFlexible()
{
std::vector<LLVolumeImplFlexible*>::iterator iter = vector_replace_with_last(sInstanceList, sInstanceList.begin() + mInstanceIndex);
std::vector<LLVolumeImplFlexible*>::iterator flex_it(sInstanceList.begin() + mInstanceIndex);
std::vector<LLVolumeImplFlexible*>::iterator iter = vector_replace_with_last(sInstanceList, flex_it);
if(iter != sInstanceList.end())
(*iter)->mInstanceIndex = mInstanceIndex;
vector_replace_with_last(sUpdateDelay,sUpdateDelay.begin() + mInstanceIndex);
std::vector<U32>::iterator update_it(sUpdateDelay.begin() + mInstanceIndex);
vector_replace_with_last(sUpdateDelay, update_it);
}
//static