diff options
author | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
commit | 8465910c79b8e746e04fd581cca2d60399e569b9 (patch) | |
tree | f43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/newview/pipeline.cpp | |
parent | Second Life viewer sources 1.18.2.1 (diff) | |
download | meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2 meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz |
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to 'linden/indra/newview/pipeline.cpp')
-rw-r--r-- | linden/indra/newview/pipeline.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index 16eaa22..8e42504 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp | |||
@@ -498,7 +498,7 @@ public: | |||
498 | { | 498 | { |
499 | for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i) | 499 | for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i) |
500 | { | 500 | { |
501 | for (std::vector<LLDrawInfo*>::iterator j = i->second.begin(); j != i->second.end(); ++j) | 501 | for (LLSpatialGroup::drawmap_elem_t::iterator j = i->second.begin(); j != i->second.end(); ++j) |
502 | { | 502 | { |
503 | LLDrawInfo* params = *j; | 503 | LLDrawInfo* params = *j; |
504 | if (mTextures.find(params->mTexture) != mTextures.end()) | 504 | if (mTextures.find(params->mTexture) != mTextures.end()) |
@@ -1651,10 +1651,10 @@ void LLPipeline::postSort(LLCamera& camera) | |||
1651 | } | 1651 | } |
1652 | for (LLSpatialGroup::draw_map_t::iterator j = group->mDrawMap.begin(); j != group->mDrawMap.end(); ++j) | 1652 | for (LLSpatialGroup::draw_map_t::iterator j = group->mDrawMap.begin(); j != group->mDrawMap.end(); ++j) |
1653 | { | 1653 | { |
1654 | std::vector<LLDrawInfo*>& src_vec = j->second; | 1654 | LLSpatialGroup::drawmap_elem_t& src_vec = j->second; |
1655 | std::vector<LLDrawInfo*>& dest_vec = mRenderMap[j->first]; | 1655 | LLSpatialGroup::drawmap_elem_t& dest_vec = mRenderMap[j->first]; |
1656 | 1656 | ||
1657 | for (std::vector<LLDrawInfo*>::iterator k = src_vec.begin(); k != src_vec.end(); ++k) | 1657 | for (LLSpatialGroup::drawmap_elem_t::iterator k = src_vec.begin(); k != src_vec.end(); ++k) |
1658 | { | 1658 | { |
1659 | dest_vec.push_back(*k); | 1659 | dest_vec.push_back(*k); |
1660 | } | 1660 | } |