summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-02-12 15:40:46 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-02-12 15:40:46 -0500
commit62d14e1a33edf2df88761969f81e70ecd0081dab (patch)
treecb0c8698c09ce432e56f622753f9cada16a467ce /indra/newview
parentf8ee9ffce6f53427b35d344a290deb6efa467463 (diff)
SL-333 WIP - added back some unused constructors to make the appearance utility happier
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewerjoint.cpp4
-rwxr-xr-xindra/newview/llviewerjoint.h2
-rwxr-xr-xindra/newview/llvoavatar.cpp6
-rwxr-xr-xindra/newview/llvoavatar.h1
4 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp
index 7bd93942b3..b7bd131246 100755
--- a/indra/newview/llviewerjoint.cpp
+++ b/indra/newview/llviewerjoint.cpp
@@ -48,6 +48,10 @@ LLViewerJoint::LLViewerJoint() :
LLAvatarJoint()
{ }
+LLViewerJoint::LLViewerJoint(S32 joint_num) :
+ LLAvatarJoint(joint_num)
+{ }
+
LLViewerJoint::LLViewerJoint(const std::string &name, LLJoint *parent) :
LLAvatarJoint(name, parent)
{ }
diff --git a/indra/newview/llviewerjoint.h b/indra/newview/llviewerjoint.h
index 75efafd138..abe11bbf5c 100755
--- a/indra/newview/llviewerjoint.h
+++ b/indra/newview/llviewerjoint.h
@@ -44,6 +44,8 @@ class LLViewerJoint :
{
public:
LLViewerJoint();
+ LLViewerJoint(S32 joint_num);
+
// *TODO: Only used for LLVOAvatarSelf::mScreenp. *DOES NOT INITIALIZE mResetAfterRestoreOldXform*
LLViewerJoint(const std::string &name, LLJoint *parent = NULL);
virtual ~LLViewerJoint();
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 15e1f88d76..762ff95840 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1175,6 +1175,12 @@ LLAvatarJoint* LLVOAvatar::createAvatarJoint()
}
// virtual
+LLAvatarJoint* LLVOAvatar::createAvatarJoint(S32 joint_num)
+{
+ return new LLViewerJoint(joint_num);
+}
+
+// virtual
LLAvatarJointMesh* LLVOAvatar::createAvatarJointMesh()
{
return new LLViewerJointMesh();
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 31c69bf88d..e1b4885bbb 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -356,6 +356,7 @@ protected:
protected:
/*virtual*/ LLAvatarJoint* createAvatarJoint(); // Returns LLViewerJoint
+ /*virtual*/ LLAvatarJoint* createAvatarJoint(S32 joint_num); // Returns LLViewerJoint
/*virtual*/ LLAvatarJointMesh* createAvatarJointMesh(); // Returns LLViewerJointMesh
public:
void updateHeadOffset();