diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:25:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:25:12 -0400 |
| commit | b2ade764a91ad1b7edcf6e21af76430f670f54fb (patch) | |
| tree | c022033f90401e6d2bf77c365540b26aa1b3eaa9 /indra/newview/llwearabletype.h | |
| parent | 8d408673e1769dbe435065c4fcf29995c3ce2f3c (diff) | |
| parent | c5abb4b116d0b31a74059dcb4b338654ca7bedfe (diff) | |
merge latest avatar-physics updates
Diffstat (limited to 'indra/newview/llwearabletype.h')
| -rw-r--r-- | indra/newview/llwearabletype.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llwearabletype.h b/indra/newview/llwearabletype.h index 3bbf8ba0bd..d633b4807e 100644 --- a/indra/newview/llwearabletype.h +++ b/indra/newview/llwearabletype.h @@ -52,7 +52,8 @@ public: WT_SKIRT = 12, WT_ALPHA = 13, WT_TATTOO = 14, - WT_COUNT = 15, + WT_PHYSICS = 15, + WT_COUNT = 16, WT_INVALID = 255, WT_NONE = -1, @@ -64,6 +65,8 @@ public: static LLAssetType::EType getAssetType(EType type); static EType typeNameToType(const std::string& type_name); static LLInventoryIcon::EIconName getIconName(EType type); + static BOOL getDisableCameraSwitch(EType type); + static BOOL getAllowMultiwear(EType type); protected: LLWearableType() {} |