diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-21 08:15:28 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-21 08:15:28 -0400 |
| commit | f47ceb47bbcfd3466813d1653992e1ea418964b5 (patch) | |
| tree | f3b1c26e835c8ddf40587783095a8b8954717d7b /indra/newview/llviewerjoint.cpp | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
| parent | a46fdc10c76ebbf76b4976f0cbb36b649fe4fdd2 (diff) | |
merged jelly-doll viewer-release into bento
Diffstat (limited to 'indra/newview/llviewerjoint.cpp')
| -rw-r--r-- | indra/newview/llviewerjoint.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp index e46299f9d2..b7bd131246 100644 --- 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() |