summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.h
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-09-18 17:00:23 -0700
committerAura Linden <aura@lindenlab.com>2014-09-18 17:00:23 -0700
commit951c83724d7e364ac52cbee2d657711fda7d2c26 (patch)
tree20b95debd0a3bb52f32df0db52d6dc91caf5793f /indra/newview/llvoavatar.h
parent78304e398fa7d4604eac98247173b33d712ec135 (diff)
parent61fb8c3fe31c73ce9121daac545aa7c8fc79ec8c (diff)
Merged in viewer-tiger
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rwxr-xr-xindra/newview/llvoavatar.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 42ff7bff92..66a357ff62 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -199,7 +199,7 @@ public:
virtual LLJoint* getJoint(const std::string &name);
- void resetJointPositionsToDefault( void );
+ void resetJointPositionsOnDetach(const std::string& attachment_name);
/*virtual*/ const LLUUID& getID() const;
/*virtual*/ void addDebugText(const std::string& text);