diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:35:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:35:29 -0400 |
commit | 96adfcfaedb2304661df15223a3df7f701b73493 (patch) | |
tree | 484b3b99cc411a394694721f5b309f07839f1a2a /indra/newview/llvoavatar.h | |
parent | 40e14802e3f5bc78546c8ed38fb1a28e46b0dd7c (diff) | |
parent | f41cbc0ac85ae328f2701aab23e94c0ef7ab5758 (diff) |
merge changes for vwr-25269
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; |