Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 7 insertions, 10 deletions

diff --git a/indra/llappearance/llavatarjointmesh.h b/indra/llappearance/llavatarjointmesh.h
index 80db7f6f15..33f50fce00 100644
--- a/indra/llappearance/llavatarjointmesh.h
+++ b/indra/llappearance/llavatarjointmesh.h
@@ -49,7 +49,7 @@ class LLSkinJoint
 public:
     LLSkinJoint();
     ~LLSkinJoint();
-    BOOL setupSkinJoint( LLAvatarJoint *joint);
+    bool setupSkinJoint( LLAvatarJoint *joint);
 
     LLAvatarJoint   *mJoint;
     LLVector3       mRootToJointSkinOffset;
@@ -69,7 +69,7 @@ protected:
     LLTexLayerSet*              mLayerSet;      // ptr to a layer set owned by the avatar
     U32                         mTestImageName;     // handle to a temporary texture for previewing uploads
     LLPolyMesh*                 mMesh;          // ptr to a global polymesh
-    BOOL                        mCullBackFaces; // true by default
+    bool                        mCullBackFaces; // true by default
     LLFace*                     mFace;          // ptr to a face w/ AGP copy of mesh
 
     U32                         mFaceIndexCount;
@@ -79,7 +79,7 @@ protected:
     S32                         mMeshID;
 
 public:
-    static BOOL                 sPipelineRender;
+    static bool                 sPipelineRender;
     //RN: this is here for testing purposes
     static U32                  sClothingMaskImageName;
     static LLColor4             sClothingInnerColor;
@@ -104,14 +104,14 @@ public:
     // Sets the shape texture
     void setTexture( LLGLTexture *texture );
 
-    BOOL hasGLTexture() const;
+    bool hasGLTexture() const;
 
     void setTestTexture( U32 name ) { mTestImageName = name; }
 
     // Sets layer set responsible for a dynamic shape texture (takes precedence over normal texture)
     void setLayerSet( LLTexLayerSet* layer_set );
 
-    BOOL hasComposite() const;
+    bool hasComposite() const;
 
     // Gets the poly mesh
     LLPolyMesh *getMesh();
@@ -122,20 +122,17 @@ public:
     // Sets up joint matrix data for rendering
     void setupJoint(LLAvatarJoint* current_joint);
 
-    // Render time method to upload batches of joint matrices
-    void uploadJointMatrices();
-
     // Sets ID for picking
     void setMeshID( S32 id ) {mMeshID = id;}
 
     // Gets ID for picking
     S32 getMeshID() { return mMeshID; }
 
-    void setIsTransparent(BOOL is_transparent) { mIsTransparent = is_transparent; }
+    void setIsTransparent(bool is_transparent) { mIsTransparent = is_transparent; }
 
 private:
     // Allocate skin data
-    BOOL allocateSkinData( U32 numSkinJoints );
+    bool allocateSkinData( U32 numSkinJoints );
 
     // Free skin data
     void freeSkinData();