summaryrefslogtreecommitdiff
path: root/indra/llappearance
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2012-09-14 11:29:17 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2012-09-14 11:29:17 -0400
commit8b2cb3766e3ed546994f81518983283e68263b09 (patch)
tree96cefa4858750b3f26fc324f8a4d54c51aecba18 /indra/llappearance
parent4e342f21ce8472bd1d9b34fdc2757a63ab24db52 (diff)
BUILDFIX: WIN fixing up windows building issues
Cleaned up a couple of things that the windows compiler was warning about, with our inheritance structure
Diffstat (limited to 'indra/llappearance')
-rw-r--r--indra/llappearance/llavatarjoint.cpp1
-rw-r--r--indra/llappearance/llavatarjoint.h3
-rwxr-xr-xindra/llappearance/llavatarjointmesh.cpp5
-rwxr-xr-xindra/llappearance/llavatarjointmesh.h4
4 files changed, 6 insertions, 7 deletions
diff --git a/indra/llappearance/llavatarjoint.cpp b/indra/llappearance/llavatarjoint.cpp
index eb450485c7..6ab341af64 100644
--- a/indra/llappearance/llavatarjoint.cpp
+++ b/indra/llappearance/llavatarjoint.cpp
@@ -73,6 +73,7 @@ void LLAvatarJoint::init()
mPickName = PN_DEFAULT;
mVisible = TRUE;
mMeshID = 0;
+ mIsTransparent = FALSE;
}
diff --git a/indra/llappearance/llavatarjoint.h b/indra/llappearance/llavatarjoint.h
index 1dfbd37456..fec91503c7 100644
--- a/indra/llappearance/llavatarjoint.h
+++ b/indra/llappearance/llavatarjoint.h
@@ -59,7 +59,7 @@ public:
// Returns true if this object is transparent.
// This is used to determine in which order to draw objects.
- virtual BOOL isTransparent() { return FALSE; }
+ virtual BOOL isTransparent() { return mIsTransparent; }
// Returns true if this object should inherit scale modifiers from its immediate parent
virtual BOOL inheritScale() { return FALSE; }
@@ -113,6 +113,7 @@ protected:
void init();
BOOL mValid;
+ BOOL mIsTransparent;
U32 mComponents;
F32 mMinPixelArea;
LLJointPickName mPickName;
diff --git a/indra/llappearance/llavatarjointmesh.cpp b/indra/llappearance/llavatarjointmesh.cpp
index c611ab7cec..4a5cff1dc3 100755
--- a/indra/llappearance/llavatarjointmesh.cpp
+++ b/indra/llappearance/llavatarjointmesh.cpp
@@ -129,8 +129,7 @@ LLAvatarJointMesh::LLAvatarJointMesh()
mTexture( NULL ),
mLayerSet( NULL ),
mTestImageName( 0 ),
- mFaceIndexCount(0),
- mIsTransparent(FALSE)
+ mFaceIndexCount(0)
{
mColor[0] = 1.0f;
@@ -151,6 +150,8 @@ LLAvatarJointMesh::LLAvatarJointMesh()
mUpdateXform = FALSE;
mValid = FALSE;
+
+ mIsTransparent = FALSE;
}
diff --git a/indra/llappearance/llavatarjointmesh.h b/indra/llappearance/llavatarjointmesh.h
index 2aade4d62b..6486932cdf 100755
--- a/indra/llappearance/llavatarjointmesh.h
+++ b/indra/llappearance/llavatarjointmesh.h
@@ -73,7 +73,6 @@ protected:
LLFace* mFace; // ptr to a face w/ AGP copy of mesh
U32 mFaceIndexCount;
- BOOL mIsTransparent;
U32 mNumSkinJoints;
LLSkinJoint* mSkinJoints;
@@ -93,9 +92,6 @@ public:
// Destructor
virtual ~LLAvatarJointMesh();
- // overloaded from base class
- /*virtual*/ BOOL isTransparent() { return mIsTransparent; }
-
// Gets the shape color
void getColor( F32 *red, F32 *green, F32 *blue, F32 *alpha );