Bento hell and back, and back to hell, and back.

2017-01-11 03:55:36 -06:00
parent 9dbdf75c14
commit 98516a2a22
54 changed files with 8482 additions and 2423 deletions
--- a/indra/newview/llviewerjoint.cpp
+++ b/indra/newview/llviewerjoint.cpp
@@ -48,14 +48,13 @@ LLViewerJoint::LLViewerJoint() :
 	LLAvatarJoint()
 { }

-LLViewerJoint::LLViewerJoint(const std::string &name, LLJoint *parent) :
-	LLAvatarJoint(name, parent)
-{ }
-
 LLViewerJoint::LLViewerJoint(S32 joint_num) :
 	LLAvatarJoint(joint_num)
 { }

+LLViewerJoint::LLViewerJoint(const std::string &name, LLJoint *parent) :
+	LLAvatarJoint(name, parent)
+{ }

 //-----------------------------------------------------------------------------
 // ~LLViewerJoint()