EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release

Actual action: branched maintenance-r68118, merged in release, then copied result into release

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 2858854a9a..f4c442b0ad 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -478,7 +478,7 @@ public:
 		{
 			for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
 			{
-				for (std::vector<LLDrawInfo*>::iterator j = i->second.begin(); j != i->second.end(); ++j)
+				for (LLSpatialGroup::drawmap_elem_t::iterator j = i->second.begin(); j != i->second.end(); ++j) 
 				{
 					LLDrawInfo* params = *j;
 					if (mTextures.find(params->mTexture) != mTextures.end())
@@ -1631,10 +1631,10 @@ void LLPipeline::postSort(LLCamera& camera)
 		}
 		for (LLSpatialGroup::draw_map_t::iterator j = group->mDrawMap.begin(); j != group->mDrawMap.end(); ++j)
 		{
-			std::vector<LLDrawInfo*>& src_vec = j->second;
-			std::vector<LLDrawInfo*>& dest_vec = mRenderMap[j->first];
+			LLSpatialGroup::drawmap_elem_t& src_vec = j->second;	
+			LLSpatialGroup::drawmap_elem_t& dest_vec = mRenderMap[j->first];  
 
-			for (std::vector<LLDrawInfo*>::iterator k = src_vec.begin(); k != src_vec.end(); ++k)
+			for (LLSpatialGroup::drawmap_elem_t::iterator k = src_vec.begin(); k != src_vec.end(); ++k) 
 			{
 				dest_vec.push_back(*k);
 			}