diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/llviewerjointmesh.h | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/llviewerjointmesh.h')
| -rw-r--r-- | indra/newview/llviewerjointmesh.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llviewerjointmesh.h b/indra/newview/llviewerjointmesh.h index 8a3cc1ae28..8e1ee514ff 100644 --- a/indra/newview/llviewerjointmesh.h +++ b/indra/newview/llviewerjointmesh.h @@ -148,8 +148,7 @@ public: void setIsTransparent(BOOL is_transparent) { mIsTransparent = is_transparent; } /*virtual*/ BOOL isAnimatable() { return FALSE; } - void writeCAL3D(apr_file_t* fp, S32 material_num, LLCharacter* characterp); - + // Avatar vertex skinning is a significant performance issue on computers // with avatar vertex programs turned off (for example, most Macs). We // therefore have custom versions that use SIMD instructions. @@ -169,8 +168,6 @@ private: // Allocate skin data BOOL allocateSkinData( U32 numSkinJoints ); - S32 getBoundJointsByIndex(S32 index, S32 &joint_a, S32& joint_b); - // Free skin data void freeSkinData(); }; |