diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-05 07:23:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-05 07:23:43 -0400 |
| commit | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (patch) | |
| tree | 327ccb1a74e828db62e8d19768ff953192d86f72 /indra/newview/llwearabletype.h | |
| parent | fa4359e571fb67aca651efc3403274cdf0bb2616 (diff) | |
| parent | 2787be7d3558c3ca1ed15863e875612b1b27ec78 (diff) | |
merge changes for STORM-1051
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() {} |