diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-04-04 10:42:52 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-04-04 10:42:52 -0400 |
| commit | 47781184fc50f6e9e0842c2d7fa7632038a279df (patch) | |
| tree | 83522faadf17895565c38d89064aff6da51a1006 /indra/newview/llwearabletype.h | |
| parent | 0dd0758ab9114c53a274ff707d626c8fe5e7afb0 (diff) | |
| parent | 3c6a09372da395a621fb35db4934af2c7c21e910 (diff) | |
Automated merge up from viewer-development into mesh-development
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() {} |