diff options
author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-09-05 17:17:54 -0700 |
---|---|---|
committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-09-05 17:17:54 -0700 |
commit | 38acb45af804968a3a75e220b45ea4b1ef489633 (patch) | |
tree | 6ea9e4237149abef95a4bc550f46dacd65d98539 /indra/newview/pipeline.h | |
parent | 608fa855b3e8d647d22e586218a4fc12277c387e (diff) | |
parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) |
Merge in latest viewer-development
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r-- | indra/newview/pipeline.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 47f3426cce..318053355a 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -157,6 +157,8 @@ public: void unlinkDrawable(LLDrawable*); + static void removeMutedAVsLights(LLVOAvatar*); + // Object related methods void markVisible(LLDrawable *drawablep, LLCamera& camera); void markOccluder(LLSpatialGroup* group); @@ -229,6 +231,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); |