diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:47:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:47:35 -0400 |
| commit | 4047349ade461fa6bac43da2a14c6e7689918aa1 (patch) | |
| tree | c1414bf26449ede2ff338b8ab286c19b754697fe /indra/newview/llwearabletype.h | |
| parent | 4aad5ee313f580e08f9689b7ff4c4c088c20f831 (diff) | |
| parent | 67316ada5a51e1dc1e4d40a805312dddaa653ae2 (diff) | |
merge out latest viewer-autobuild2010 changes
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() {} |