aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter/llmotioncontroller.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:01 -0500
committerJacek Antonelli2008-08-15 23:45:01 -0500
commit28d8d4e7664bcd6c8369cc18832e42096af7cad2 (patch)
tree069020fe66339aff2ca4176370ff743b14713f2d /linden/indra/llcharacter/llmotioncontroller.h
parentSecond Life viewer sources 1.17.2.0 (diff)
downloadmeta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.zip
meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.gz
meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.bz2
meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.xz
Second Life viewer sources 1.17.3.0
Diffstat (limited to 'linden/indra/llcharacter/llmotioncontroller.h')
-rw-r--r--linden/indra/llcharacter/llmotioncontroller.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llcharacter/llmotioncontroller.h b/linden/indra/llcharacter/llmotioncontroller.h
index 94149da..959a16a 100644
--- a/linden/indra/llcharacter/llmotioncontroller.h
+++ b/linden/indra/llcharacter/llmotioncontroller.h
@@ -182,7 +182,7 @@ protected:
182 void deleteAllMotions(); 182 void deleteAllMotions();
183 void addLoadedMotion(LLMotion *motion); 183 void addLoadedMotion(LLMotion *motion);
184 BOOL activateMotion(LLMotion *motion, F32 time); 184 BOOL activateMotion(LLMotion *motion, F32 time);
185 BOOL deactivateMotion(LLMotion *motion); 185 BOOL deactivateMotion(LLMotion *motion, bool remove_weight);
186 void updateRegularMotions(); 186 void updateRegularMotions();
187 void updateAdditiveMotions(); 187 void updateAdditiveMotions();
188 void resetJointSignatures(); 188 void resetJointSignatures();