diff options
| author | graham linden <graham@lindenlab.com> | 2013-04-16 08:28:38 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-04-16 08:28:38 -0700 |
| commit | a054dff522ea874691cd859a8909a29d45cc8bd8 (patch) | |
| tree | dfe34ed98d1d02d68084d1951fbc8f27f4360e9e /indra/newview/llvotree.h | |
| parent | c4413f493e65d1c12f382a9fe4363e90c6a1b8c3 (diff) | |
| parent | d1f713f30bd4d42fe4696e25c01ab4532ef3b69b (diff) | |
Merged lindenlab/viewer-development-materials into default
Diffstat (limited to 'indra/newview/llvotree.h')
| -rw-r--r-- | indra/newview/llvotree.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llvotree.h b/indra/newview/llvotree.h index 52debc85ab..2a7eb21238 100644 --- a/indra/newview/llvotree.h +++ b/indra/newview/llvotree.h @@ -104,10 +104,7 @@ public: F32 twist, F32 droop, F32 branches, - F32 alpha); - - U32 drawBranchPipeline(LLMatrix4& matrix, U16* indicesp, S32 trunk_LOD, S32 stop_level, U16 depth, U16 trunk_depth, F32 scale, F32 twist, F32 droop, F32 branches, F32 alpha); - + F32 alpha); /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face = -1, // which face to check, -1 = ALL_SIDES |