diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:47:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:47:35 -0400 |
commit | 4047349ade461fa6bac43da2a14c6e7689918aa1 (patch) | |
tree | c1414bf26449ede2ff338b8ab286c19b754697fe /indra/newview/llvoavatar.h | |
parent | 4aad5ee313f580e08f9689b7ff4c4c088c20f831 (diff) | |
parent | 67316ada5a51e1dc1e4d40a805312dddaa653ae2 (diff) |
merge out latest viewer-autobuild2010 changes
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r-- | indra/newview/llvoavatar.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index a779a1735c..3659fb055f 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -50,6 +50,7 @@ extern const LLUUID ANIM_AGENT_BODY_NOISE; extern const LLUUID ANIM_AGENT_BREATHE_ROT; +extern const LLUUID ANIM_AGENT_PHYSICS_MOTION; extern const LLUUID ANIM_AGENT_EDITING; extern const LLUUID ANIM_AGENT_EYE; extern const LLUUID ANIM_AGENT_FLY_ADJUST; @@ -240,6 +241,7 @@ public: static BOOL sDebugInvisible; static BOOL sShowAttachmentPoints; static F32 sLODFactor; // user-settable LOD factor + static F32 sPhysicsLODFactor; // user-settable physics LOD factor static BOOL sJointDebug; // output total number of joints being touched for each avatar static BOOL sDebugAvatarRotation; |