diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-24 10:51:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-24 10:51:37 -0400 |
| commit | 8df36196215131cbac961f47bfbd4a1b925548cb (patch) | |
| tree | 35fe890f1f2e47c9acd0d411925897ee7e3794d6 /indra/newview/pipeline.h | |
| parent | 4feef5af63f6294249aa50e37fba712cd9ddec91 (diff) | |
| parent | d7015a2b9b55907c8447d0051cf5d7ac862aebf7 (diff) | |
merge to viewer-developmento
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index ef1fd3279d..368be1c14d 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -294,10 +294,10 @@ public: void setLight(LLDrawable *drawablep, BOOL is_light); BOOL hasRenderBatches(const U32 type) const; - LLCullResult::drawinfo_list_t::iterator beginRenderMap(U32 type); - LLCullResult::drawinfo_list_t::iterator endRenderMap(U32 type); - LLCullResult::sg_list_t::iterator beginAlphaGroups(); - LLCullResult::sg_list_t::iterator endAlphaGroups(); + LLCullResult::drawinfo_iterator beginRenderMap(U32 type); + LLCullResult::drawinfo_iterator endRenderMap(U32 type); + LLCullResult::sg_iterator beginAlphaGroups(); + LLCullResult::sg_iterator endAlphaGroups(); void addTrianglesDrawn(S32 index_count, U32 render_type = LLRender::TRIANGLES); |