summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-02-29 14:41:47 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-02-29 14:41:47 -0800
commit3d237bd242c01895c8122b0a2fda3e305992fd1b (patch)
treecb72a03d3d94382161d76bcdebf717316e7a6da7 /indra/llprimitive
parent894d79e4ecccda85e357f859c666031cc138e34b (diff)
PATH-199: Starting to introducing the pathfinding flags for the object.
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/object_flags.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/llprimitive/object_flags.h b/indra/llprimitive/object_flags.h
index 278ab12aa3..f7f6841b53 100644
--- a/indra/llprimitive/object_flags.h
+++ b/indra/llprimitive/object_flags.h
@@ -40,26 +40,26 @@ const U32 FLAGS_OBJECT_MOVE = (1U << 8);
const U32 FLAGS_TAKES_MONEY = (1U << 9);
const U32 FLAGS_PHANTOM = (1U << 10);
const U32 FLAGS_INVENTORY_EMPTY = (1U << 11);
-//const U32 FLAGS_UNUSED_000 = (1U << 12); // was FLAGS_JOINT_HINGE
-//const U32 FLAGS_UNUSED_001 = (1U << 13); // was FLAGS_JOINT_P2P
-//const U32 FLAGS_UNUSED_002 = (1U << 14); // was FLAGS_JOINT_LP2P
+const U32 FLAGS_OBJECT_PERMANENT = (1U << 12);
+const U32 FLAGS_CHARACTER = (1U << 13);
+//const U32 FLAGS_UNUSED_000 = (1U << 14); // was FLAGS_JOINT_LP2P
const U32 FLAGS_INCLUDE_IN_SEARCH = (1U << 15);
const U32 FLAGS_ALLOW_INVENTORY_DROP = (1U << 16);
const U32 FLAGS_OBJECT_TRANSFER = (1U << 17);
const U32 FLAGS_OBJECT_GROUP_OWNED = (1U << 18);
-//const U32 FLAGS_UNUSED_003 = (1U << 19); // was FLAGS_OBJECT_YOU_OFFICER
+//const U32 FLAGS_UNUSED_001 = (1U << 19); // was FLAGS_OBJECT_YOU_OFFICER
const U32 FLAGS_CAMERA_DECOUPLED = (1U << 20);
const U32 FLAGS_ANIM_SOURCE = (1U << 21);
const U32 FLAGS_CAMERA_SOURCE = (1U << 22);
-//const U32 FLAGS_UNUSED_004 = (1U << 23); // was FLAGS_CAST_SHADOWS
-//const U32 FLAGS_UNUSED_005 = (1U << 24);
-//const U32 FLAGS_UNUSED_006 = (1U << 25);
-//const U32 FLAGS_UNUSED_007 = (1U << 26);
-//const U32 FLAGS_UNUSED_008 = (1U << 27);
+//const U32 FLAGS_UNUSED_002 = (1U << 23); // was FLAGS_CAST_SHADOWS
+//const U32 FLAGS_UNUSED_003 = (1U << 24);
+//const U32 FLAGS_UNUSED_004 = (1U << 25);
+//const U32 FLAGS_UNUSED_005 = (1U << 26);
+//const U32 FLAGS_UNUSED_006 = (1U << 27);
const U32 FLAGS_OBJECT_OWNER_MODIFY = (1U << 28);
const U32 FLAGS_TEMPORARY_ON_REZ = (1U << 29);
-//const U32 FLAGS_UNUSED_009 = (1U << 30); // was FLAGS_TEMPORARY
-//const U32 FLAGS_UNUSED_010 = (1U << 31); // was FLAGS_ZLIB_COMPRESSED
+//const U32 FLAGS_UNUSED_007 = (1U << 30); // was FLAGS_TEMPORARY
+//const U32 FLAGS_UNUSED_008 = (1U << 31); // was FLAGS_ZLIB_COMPRESSED
const U32 FLAGS_LOCAL = FLAGS_ANIM_SOURCE | FLAGS_CAMERA_SOURCE;
typedef enum e_havok_joint_type