diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-04 23:43:13 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-04 23:43:13 -0600 |
| commit | ff0271d632eb59fef1dc52ff261064b6a09abefa (patch) | |
| tree | f1554768fa9f1dfcb84f3df0f7aeaa35172080b2 /indra/newview/pipeline.h | |
| parent | 7d2d8ea58f572a6df08b04f64f3b71501ee21f6c (diff) | |
| parent | 979ddb2ec952f836f7cde7cbc85559b8e9582416 (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 |