From 62d14e1a33edf2df88761969f81e70ecd0081dab Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 12 Feb 2016 15:40:46 -0500 Subject: SL-333 WIP - added back some unused constructors to make the appearance utility happier --- indra/llcharacter/lljoint.cpp | 7 +++++++ indra/llcharacter/lljoint.h | 15 +++++++++++++++ 2 files changed, 22 insertions(+) (limited to 'indra/llcharacter') diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index af50a3f574..264ec44c02 100755 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -121,6 +121,13 @@ LLJoint::LLJoint() : touch(); } +LLJoint::LLJoint(S32 joint_num) : + mJointNum(joint_num) +{ + init(); + touch(); +} + //----------------------------------------------------------------------------- // LLJoint() // Class Constructor diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index f5007a3f06..e666f177e7 100755 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -143,6 +143,21 @@ public: public: LLJoint(); + + // Note: these joint_num constructors are a bad idea because there + // are only a couple of places in the code where it is useful to + // have a joint num for a joint (for joints that are used in + // animations), and including them as part of the constructor then + // forces us to maintain an alternate path through the entire + // large-ish class hierarchy of joint types. The only reason they + // are still here now is to avoid breaking the baking service + // (appearanceutility) builds; these constructors are not used in + // the viewer. Once the appearance utility is updated to remove + // these joint num references, which it shouldn't ever need, from + // its own classes, we can also remove all the joint_num + // constructors from LLJoint, LLViewerJoint, LLAvatarJoint, and + // createAvatarJoint. + LLJoint(S32 joint_num); // *TODO: Only used for LLVOAvatarSelf::mScreenp. *DOES NOT INITIALIZE mResetAfterRestoreOldXform* LLJoint( const std::string &name, LLJoint *parent=NULL ); -- cgit v1.2.3