diff options
author | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
commit | b7f8a2479249646c7fb38ead195d5197ab733c94 (patch) | |
tree | c1bf4a2b0ecac69a4705827a042ea7f0224ebc54 /indra/newview/llvograss.cpp | |
parent | c94756d92c7353cb91bfddb5e342f825457e1a7e (diff) | |
parent | f8749ec9bd03072cc5b50f4cb1a61289b2989c72 (diff) |
merge up to 3.4.1-release
Diffstat (limited to 'indra/newview/llvograss.cpp')
-rw-r--r-- | indra/newview/llvograss.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp index 44968342bf..5ad9ccc9af 100644 --- a/indra/newview/llvograss.cpp +++ b/indra/newview/llvograss.cpp @@ -622,7 +622,7 @@ void LLGrassPartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_count mFaceList.clear(); LLViewerCamera* camera = LLViewerCamera::getInstance(); - for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i) + for (LLSpatialGroup::element_iter i = group->getDataBegin(); i != group->getDataEnd(); ++i) { LLDrawable* drawablep = *i; |