summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.h
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-11-12 12:58:28 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-11-12 12:58:28 -0800
commit0e6139eb3d3af1e77df20f87deef427993bf2c61 (patch)
tree2c93f9a8d69f28cec99393b3cacbab85a8aa073d /indra/newview/pipeline.h
parent6f53b5baeb9e04c20c8fe6f419e09c9604a56497 (diff)
parent7833ecb58094641d3cd79c6772ad6c9fd4799f92 (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r--indra/newview/pipeline.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 0140e24d63..fd2a1e06cd 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -151,6 +151,8 @@ public:
void unlinkDrawable(LLDrawable*);
+ static void removeMutedAVsLights(LLVOAvatar*);
+
// Object related methods
void markVisible(LLDrawable *drawablep, LLCamera& camera);
void markOccluder(LLSpatialGroup* group);
@@ -223,6 +225,7 @@ public:
void updateGL();
void rebuildPriorityGroups();
void rebuildGroups();
+ void clearRebuildGroups();
//calculate pixel area of given box from vantage point of given camera
static F32 calcPixelArea(LLVector3 center, LLVector3 size, LLCamera& camera);