Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Testicular Slingshot
Alchemy Viewer
Commits
e7bae433
Commit
e7bae433
authored
Jan 01, 2020
by
Rye Mutt
🍞
Browse files
Fix more member variable shadowing
parent
82026aba
Changes
2
Hide whitespace changes
Inline
Side-by-side
indra/llappearance/llavatarjoint.cpp
View file @
e7bae433
...
...
@@ -71,7 +71,6 @@ void LLAvatarJoint::init()
mMinPixelArea
=
DEFAULT_AVATAR_JOINT_LOD
;
mPickName
=
PN_DEFAULT
;
mVisible
=
TRUE
;
mMeshID
=
0
;
mIsTransparent
=
FALSE
;
}
...
...
indra/llappearance/llavatarjointmesh.h
View file @
e7bae433
...
...
@@ -76,7 +76,6 @@ protected:
U32
mNumSkinJoints
;
LLSkinJoint
*
mSkinJoints
;
S32
mMeshID
;
public:
static
BOOL
sPipelineRender
;
...
...
@@ -125,9 +124,6 @@ public:
// 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
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment