summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/keywords.ini
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-04-07 12:39:45 -0500
committerDave Parks <davep@lindenlab.com>2010-04-07 12:39:45 -0500
commitb6d3d2281b855448bbeec33b2d229222d75cd6b1 (patch)
tree99b5c533bcf19a4b02247e601939346b6f2151df /indra/newview/app_settings/keywords.ini
parent87cce27de3dd23a40d812a7c9000b1972cb4bca3 (diff)
parent3b7b578733867efaeb9359df69df1fe400de0f10 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings/keywords.ini')
-rw-r--r--indra/newview/app_settings/keywords.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 0805e94b10..18edce42a4 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -353,6 +353,11 @@ PRIM_BUMP_SHINY Followed by an integer face, one of PRIM_SHINY_NONE, PRIM_SHINY
PRIM_FULLBRIGHT Followed by an integer face, and TRUE or FALSE
PRIM_TEXGEN Followed by an integer face, and one of PRIM_TEXGEN_DEFAULT or PRIM_TEXGEN_PLANAR
PRIM_GLOW Followed by an integer face, and a float from 0.0 to 1.0 specifying glow amount
+PRIM_PHYSICS_SHAPE_TYPE Followed by one of PRIM_PHYSICS_SHAPE_PRIM (use prim as-is for physics), PRIM_PHYSICS_SHAPE_NONE (do not use prim for physics), PRIM_PHYSICS_SHAPE_CONVEX (use convex hull of prim for physics)
+
+PRIM_PHYSICS_SHAPE_PRIM Sets the physics shape type to PRIM (i.e., use the prim as-is in the physics engine)
+PRIM_PHYSICS_SHAPE_NONE Sets the physics shape type to NONE (i.e., the shape will not exist the physics engine)
+PRIM_PHYSICS_SHAPE_CONVEX Sets the physics shape type to CONVEX (i.e., use the convex hull of the prim in the physics engine)
PRIM_TYPE_BOX Followed by integer hole shape, vector cut, float hollow, vector twist,:vector top size, and vector top shear
PRIM_TYPE_CYLINDER Followed by integer hole shape, vector cut, float hollow, vector twist,:vector top size, and vector top shear