diff options
| -rw-r--r-- | indra/llprimitive/object_flags.h | 22 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.h | 2 |
2 files changed, 13 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
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index b6e3f0442e..63215942ac 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -477,6 +477,8 @@ public: inline BOOL flagObjectCopy() const { return ((mFlags & FLAGS_OBJECT_COPY) != 0); } inline BOOL flagObjectMove() const { return ((mFlags & FLAGS_OBJECT_MOVE) != 0); } inline BOOL flagObjectTransfer() const { return ((mFlags & FLAGS_OBJECT_TRANSFER) != 0); } + inline BOOL flagObjectPermanent() const { return ((mFlags & FLAGS_OBJECT_PERMANENT) != 0); } + inline BOOL flagCharacter() const { return ((mFlags & FLAGS_CHARACTER) != 0); } inline BOOL flagIncludeInSearch() const { return ((mFlags & FLAGS_INCLUDE_IN_SEARCH) != 0); } inline BOOL flagScripted() const { return ((mFlags & FLAGS_SCRIPTED) != 0); } inline BOOL flagHandleTouch() const { return ((mFlags & FLAGS_HANDLE_TOUCH) != 0); } |