summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/keywords.ini
diff options
context:
space:
mode:
authorDave Parks <none@none>2010-06-08 23:13:05 -0500
committerDave Parks <none@none>2010-06-08 23:13:05 -0500
commitc2da9f5d2cc86af0af34199c53e872fbff22637b (patch)
tree326f7e77cf619eb81c5838791b2e4f0a60a032d4 /indra/newview/app_settings/keywords.ini
parent2cfc9f57bb22ab732cdc55b5e48ff9a05040d05a (diff)
parent22102e41cbf4ce9e1c0d069f111849466e297520 (diff)
Merge with viewer-experimental
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 263b73ba23..9f8d89abc6 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