diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 17:07:18 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 17:07:18 -0800 |
| commit | 0980df1e0ce99bdafdd4e806cbacad96c71729cc (patch) | |
| tree | 20a76a1b07928ac9aa9453765b5c4a92b0b318c7 /indra/newview/pipeline.h | |
| parent | 187acf0c3af6d5fee301137a49993fbc75039f38 (diff) | |
| parent | da79eb5545ae0604bad357d71b54e2381fc480e8 (diff) | |
merge
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 711d40b138..46231048e8 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -270,8 +270,7 @@ public: void shiftObjects(const LLVector3 &offset); void setLight(LLDrawable *drawablep, BOOL is_light); - void setActive(LLDrawable *drawablep, BOOL active); - + BOOL hasRenderBatches(const U32 type) const; LLCullResult::drawinfo_list_t::iterator beginRenderMap(U32 type); LLCullResult::drawinfo_list_t::iterator endRenderMap(U32 type); @@ -589,8 +588,6 @@ protected: LLViewerObject::vobj_list_t mCreateQ; - LLDrawable::drawable_set_t mActiveQ; - LLDrawable::drawable_set_t mRetexturedList; class HighlightItem |