diff options
| author | Melanie | 2011-11-28 11:21:15 +0100 |
|---|---|---|
| committer | Melanie | 2011-11-28 11:21:15 +0100 |
| commit | 80148bf7844690baf0f70226627bd42e6501f125 (patch) | |
| tree | 7632978d49f16a84c1cf3b4d9cec6dcc715e0750 /OpenSim/Framework/TaskInventoryItem.cs | |
| parent | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge (diff) | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC-80148bf7844690baf0f70226627bd42e6501f125.zip opensim-SC-80148bf7844690baf0f70226627bd42e6501f125.tar.gz opensim-SC-80148bf7844690baf0f70226627bd42e6501f125.tar.bz2 opensim-SC-80148bf7844690baf0f70226627bd42e6501f125.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Framework/TaskInventoryItem.cs')
| -rw-r--r-- | OpenSim/Framework/TaskInventoryItem.cs | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index be2b8c8..fa514f0 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs | |||
| @@ -40,63 +40,6 @@ namespace OpenSim.Framework | |||
| 40 | /// </summary> | 40 | /// </summary> |
| 41 | private const uint FULL_MASK_PERMISSIONS_GENERAL = 2147483647; | 41 | private const uint FULL_MASK_PERMISSIONS_GENERAL = 2147483647; |
| 42 | 42 | ||
| 43 | /// <summary> | ||
| 44 | /// Inventory types | ||
| 45 | /// </summary> | ||
| 46 | public static string[] InvTypes = new string[] | ||
| 47 | { | ||
| 48 | "texture", | ||
| 49 | "sound", | ||
| 50 | "calling_card", | ||
| 51 | "landmark", | ||
| 52 | String.Empty, | ||
| 53 | String.Empty, | ||
| 54 | "object", | ||
| 55 | "notecard", | ||
| 56 | String.Empty, | ||
| 57 | String.Empty, | ||
| 58 | "lsl_text", | ||
| 59 | String.Empty, | ||
| 60 | String.Empty, | ||
| 61 | "bodypart", | ||
| 62 | String.Empty, | ||
| 63 | "snapshot", | ||
| 64 | String.Empty, | ||
| 65 | String.Empty, | ||
| 66 | "wearable", | ||
| 67 | "animation", | ||
| 68 | "gesture" | ||
| 69 | }; | ||
| 70 | |||
| 71 | /// <summary> | ||
| 72 | /// Asset types | ||
| 73 | /// </summary> | ||
| 74 | public static string[] Types = new string[] | ||
| 75 | { | ||
| 76 | "texture", | ||
| 77 | "sound", | ||
| 78 | "callcard", | ||
| 79 | "landmark", | ||
| 80 | "clothing", // Deprecated | ||
| 81 | "clothing", | ||
| 82 | "object", | ||
| 83 | "notecard", | ||
| 84 | "category", | ||
| 85 | "root", | ||
| 86 | "lsltext", | ||
| 87 | "lslbyte", | ||
| 88 | "txtr_tga", | ||
| 89 | "bodypart", | ||
| 90 | "trash", | ||
| 91 | "snapshot", | ||
| 92 | "lstndfnd", | ||
| 93 | "snd_wav", | ||
| 94 | "img_tga", | ||
| 95 | "jpeg", | ||
| 96 | "animatn", | ||
| 97 | "gesture" | ||
| 98 | }; | ||
| 99 | |||
| 100 | private UUID _assetID = UUID.Zero; | 43 | private UUID _assetID = UUID.Zero; |
| 101 | 44 | ||
| 102 | private uint _baseMask = FULL_MASK_PERMISSIONS_GENERAL; | 45 | private uint _baseMask = FULL_MASK_PERMISSIONS_GENERAL; |