summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-09-08 17:58:17 -0400
committerLoren Shih <seraph@lindenlab.com>2010-09-08 17:58:17 -0400
commiteed7b7201188e01a452c7f4c511c0cb157dc7a5f (patch)
treee705e93230361aee2c1573f6c37d5d53abda42a0 /indra/newview/llvoavatar.h
parenta2fb3fabc7926dd105393391f334baa78f232640 (diff)
parent45639aa0d1889a6cbd9223e987740d25d96ed8fd (diff)
automated merge
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r--indra/newview/llvoavatar.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index d51b8701af..bb7ed7d354 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -48,6 +48,7 @@
extern const LLUUID ANIM_AGENT_BODY_NOISE;
extern const LLUUID ANIM_AGENT_BREATHE_ROT;
+extern const LLUUID ANIM_AGENT_BREAST_MOTION;
extern const LLUUID ANIM_AGENT_EDITING;
extern const LLUUID ANIM_AGENT_EYE;
extern const LLUUID ANIM_AGENT_FLY_ADJUST;
@@ -228,6 +229,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;