diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:20:36 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:20:36 -0400 |
| commit | d516a8729e413e3097c468e8f3c2c39ff73181bd (patch) | |
| tree | 3ba17c58af42f23e77199516be4674245328cd86 /indra/llprimitive/object_flags.h | |
| parent | 3f001b520c42d9182de89c3cacb79f6684dd0471 (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
merge
Diffstat (limited to 'indra/llprimitive/object_flags.h')
| -rwxr-xr-x | indra/llprimitive/object_flags.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llprimitive/object_flags.h b/indra/llprimitive/object_flags.h index 31dbd15ae0..88eaeb034a 100755 --- a/indra/llprimitive/object_flags.h +++ b/indra/llprimitive/object_flags.h @@ -69,6 +69,7 @@ const U32 FLAGS_TEMPORARY_ON_REZ = (1U << 29); //const U32 FLAGS_UNUSED_007 = (1U << 31); // was FLAGS_ZLIB_COMPRESSED const U32 FLAGS_LOCAL = FLAGS_ANIM_SOURCE | FLAGS_CAMERA_SOURCE; +const U32 FLAGS_WORLD = FLAGS_USE_PHYSICS | FLAGS_PHANTOM | FLAGS_TEMPORARY_ON_REZ; typedef enum e_havok_joint_type { |