Second Life viewer sources 1.14.0.0

1 files changed, 12 insertions, 1 deletions

diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h
index 4d11d20..fb35dd9 100644
--- a/linden/indra/newview/llvotree.h
+++ b/linden/indra/newview/llvotree.h
@@ -39,6 +39,14 @@ class LLDrawPool;
 class LLVOTree : public LLViewerObject
 {
 public:
+        enum 
+        {
+                VERTEX_DATA_MASK =      (1 << LLVertexBuffer::TYPE_VERTEX) |
+                                                        (1 << LLVertexBuffer::TYPE_NORMAL) |
+                                                        (1 << LLVertexBuffer::TYPE_TEXCOORD)
+        }
+        eVertexDataMask;
+
         LLVOTree(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
         virtual ~LLVOTree();
 
@@ -59,10 +67,13 @@ public:
 
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
         /*virtual*/ BOOL                updateGeometry(LLDrawable *drawable);
+        /*virtual*/ void                updateSpatialExtents(LLVector3 &min, LLVector3 &max);
+
+        virtual U32 getPartitionType() const;
 
         void updateRadius();
 
-        void drawBranchPipeline(LLDrawPool *draw_pool, S32 trunk_LOD, S32 stop_level, U16 depth, U16 trunk_depth,  F32 scale, F32 twist, F32 droop,  F32 branches, F32 alpha);
+        U32 drawBranchPipeline(U32* indicesp, S32 trunk_LOD, S32 stop_level, U16 depth, U16 trunk_depth,  F32 scale, F32 twist, F32 droop,  F32 branches, F32 alpha);
  
         void drawBranch(S32 stop_level, U16 depth, U16 trunk_depth, F32 scale, F32 twist, F32 droop,  F32 branches, F32 alpha, BOOL draw_leaves);