diff options
| author | Palmer <palmer@lindenlab.com> | 2010-02-12 15:16:19 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-02-12 15:16:19 -0800 |
| commit | 418504207bdbdac9b41f731d87562d7d08a229d2 (patch) | |
| tree | 8eb914baeeaa05fb8ce6f4556eabd697b3c45afe /indra/newview/pipeline.h | |
| parent | 434436ef6b96f74eaf0daf687c6978d5a24d5be7 (diff) | |
| parent | 43ca4e104b613c95a1147751122f7ff007542e5c (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 67004a5f2d..c5285943e8 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 |