diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-08-12 13:46:25 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-08-12 13:46:25 -0400 |
commit | 4961ee03c7af92754f853530a4d346ed84f721d1 (patch) | |
tree | 0a422b619b264cf393a3f8d4f4e90f33a407e57c /indra/newview/llvoavatarself.cpp | |
parent | 6128cd9f705ca5565cafbe4b969c767b138cd1f6 (diff) | |
parent | 8abd6ed6b8c294ec6bfca59929dbcc71cd65c3a3 (diff) |
merge
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rwxr-xr-x | indra/newview/llvoavatarself.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 05bd3101ea..a710c95233 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -671,11 +671,6 @@ LLJoint *LLVOAvatarSelf::getJoint(const std::string &name) } return LLVOAvatar::getJoint(name); } -//virtual -void LLVOAvatarSelf::resetJointPositions( void ) -{ - return LLVOAvatar::resetJointPositions(); -} // virtual BOOL LLVOAvatarSelf::setVisualParamWeight(const LLVisualParam *which_param, F32 weight, BOOL upload_bake ) { |