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

16
indra/newview/llviewerpartsim.cpp
View File

@@ -406,7 +406,8 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
// Kill dead particles (either flagged dead, or too old)
if ((part->mLastUpdateTime > part->mMaxAge) || (LLViewerPart::LL_PART_DEAD_MASK == part->mFlags))
{
vector_replace_with_last(mParticles,mParticles.begin() + i);
part_list_t::iterator it(mParticles.begin() + i);
vector_replace_with_last(mParticles, it);
delete part ;
}
else
@@ -416,7 +417,8 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
{
// Transfer particles between groups
LLViewerPartSim::getInstance()->put(part) ;
vector_replace_with_last(mParticles,mParticles.begin() + i);
part_list_t::iterator it(mParticles.begin() + i);
vector_replace_with_last(mParticles, it);
}
else
{
@@ -721,8 +723,9 @@ void LLViewerPartSim::updateSimulation()
if (mViewerPartSources[i]->isDead())
{
vector_replace_with_last(mViewerPartSources,mViewerPartSources.begin() + i);
//mViewerPartSources.erase(mViewerPartSources.begin() + i);
source_list_t::iterator it(mViewerPartSources.begin() + i);
vector_replace_with_last(mViewerPartSources, it);
//mViewerPartSources.erase(it);
count--;
}
else
@@ -758,8 +761,9 @@ void LLViewerPartSim::updateSimulation()
if (!mViewerPartGroups[i]->getCount())
{
delete mViewerPartGroups[i];
vector_replace_with_last(mViewerPartGroups,mViewerPartGroups.begin() + i);
//mViewerPartGroups.erase(mViewerPartGroups.begin() + i);
group_list_t::iterator it(mViewerPartGroups.begin() + i);
vector_replace_with_last(mViewerPartGroups, it);
//mViewerPartGroups.erase(it);
i--;
count--;
}