From 68ec4d8355326f7c42c8e6fbabe774df6e5f41dd Mon Sep 17 00:00:00 2001 From: Paul ProductEngine <pguslisty@productengine.com> Date: Fri, 4 May 2012 20:21:54 +0300 Subject: [PATCH] Linux build fix. GCC doesn't allow to init non-constant references with temporary objects --- indra/newview/llvopartgroup.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index 42b35ff7a7f..49356467a0d 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -619,12 +619,13 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group) S32 geom_idx = (S32) facep->getGeomIndex(); - object->getGeometry(facep->getTEOffset(), - verticesp+geom_idx, - normalsp+geom_idx, - texcoordsp+geom_idx, - colorsp+geom_idx, - indicesp+facep->getIndicesStart()); + verticesp += geom_idx; + normalsp += geom_idx; + texcoordsp += geom_idx; + colorsp += geom_idx; + indicesp += facep->getIndicesStart(); + + object->getGeometry(facep->getTEOffset(), verticesp, normalsp, texcoordsp, colorsp, indicesp); llassert(facep->getGeomCount() == 4); llassert(facep->getIndicesCount() == 6); -- GitLab