2 files changed, 228 insertions, 177 deletions
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index 537de7a..db4541e 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -38,189 +38,239 @@ namespace OpenSim.Framework
    public static class SLUtil
    {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
        #region SL / file extension / content-type conversions
-        private class TypeMapping
+        public static string SLAssetTypeToContentType(int assetType)
        {
-            private sbyte assetType;
+            switch ((AssetType)assetType)
-            private InventoryType inventoryType;
-            private string contentType;
-            private string contentType2;
-            private string extension;
-            public sbyte AssetTypeCode
-            {
-                get { return assetType; }
-            }
-            public object AssetType
-            {
-                get {
-                    if (Enum.IsDefined(typeof(OpenMetaverse.AssetType), assetType))
-                        return (OpenMetaverse.AssetType)assetType;
-                    else
-                        return OpenMetaverse.AssetType.Unknown;
-                }
-            }
-            public InventoryType InventoryType
-            {
-                get { return inventoryType; }
-            }
-            public string ContentType
-            {
-                get { return contentType; }
-            }
-            public string ContentType2
-            {
-                get { return contentType2; }
-            }
-            public string Extension
-            {
-                get { return extension; }
-            }
-            private TypeMapping(sbyte assetType, InventoryType inventoryType, string contentType, string contentType2, string extension)
-            {
-                this.assetType = assetType;
-                this.inventoryType = inventoryType;
-                this.contentType = contentType;
-                this.contentType2 = contentType2;
-                this.extension = extension;
-            }
-            public TypeMapping(AssetType assetType, InventoryType inventoryType, string contentType, string contentType2, string extension)
-                : this((sbyte)assetType, inventoryType, contentType, contentType2, extension)
-            {
-            }
-            public TypeMapping(AssetType assetType, InventoryType inventoryType, string contentType, string extension)
-                : this((sbyte)assetType, inventoryType, contentType, null, extension)
            {
+                case AssetType.Texture:
+                    return "image/x-j2c";
+                case AssetType.Sound:
+                    return "audio/ogg";
+                case AssetType.CallingCard:
+                    return "application/vnd.ll.callingcard";
+                case AssetType.Landmark:
+                    return "application/vnd.ll.landmark";
+                case AssetType.Clothing:
+                    return "application/vnd.ll.clothing";
+                case AssetType.Object:
+                    return "application/vnd.ll.primitive";
+                case AssetType.Notecard:
+                    return "application/vnd.ll.notecard";
+                case AssetType.Folder:
+                    return "application/vnd.ll.folder";
+                case AssetType.RootFolder:
+                    return "application/vnd.ll.rootfolder";
+                case AssetType.LSLText:
+                    return "application/vnd.ll.lsltext";
+                case AssetType.LSLBytecode:
+                    return "application/vnd.ll.lslbyte";
+                case AssetType.TextureTGA:
+                case AssetType.ImageTGA:
+                    return "image/tga";
+                case AssetType.Bodypart:
+                    return "application/vnd.ll.bodypart";
+                case AssetType.TrashFolder:
+                    return "application/vnd.ll.trashfolder";
+                case AssetType.SnapshotFolder:
+                    return "application/vnd.ll.snapshotfolder";
+                case AssetType.LostAndFoundFolder:
+                    return "application/vnd.ll.lostandfoundfolder";
+                case AssetType.SoundWAV:
+                    return "audio/x-wav";
+                case AssetType.ImageJPEG:
+                    return "image/jpeg";
+                case AssetType.Animation:
+                    return "application/vnd.ll.animation";
+                case AssetType.Gesture:
+                    return "application/vnd.ll.gesture";
+                case AssetType.Simstate:
+                    return "application/x-metaverse-simstate";
+                case AssetType.FavoriteFolder:
+                    return "application/vnd.ll.favoritefolder";
+                case AssetType.Link:
+                    return "application/vnd.ll.link";
+                case AssetType.LinkFolder:
+                    return "application/vnd.ll.linkfolder";
+                case AssetType.CurrentOutfitFolder:
+                    return "application/vnd.ll.currentoutfitfolder";
+                case AssetType.OutfitFolder:
+                    return "application/vnd.ll.outfitfolder";
+                case AssetType.MyOutfitsFolder:
+                    return "application/vnd.ll.myoutfitsfolder";
+                case AssetType.Unknown:
+                default:
+                    return "application/octet-stream";
            }
        }
-        /// <summary>
+        public static string SLInvTypeToContentType(int invType)
-        /// Maps between AssetType, InventoryType and Content-Type.
-        /// Where more than one possibility exists, the first one takes precedence. E.g.:
-        ///   AssetType "AssetType.Texture" -> Content-Type "image-xj2c"
-        ///   Content-Type "image/x-j2c" -> InventoryType "InventoryType.Texture"
-        /// </summary>
-        private static TypeMapping[] MAPPINGS = new TypeMapping[] {
-            new TypeMapping(AssetType.Unknown, InventoryType.Unknown, "application/octet-stream", "bin"),
-            new TypeMapping(AssetType.Texture, InventoryType.Texture, "image/x-j2c", "image/jp2", "j2c"),
-            new TypeMapping(AssetType.Texture, InventoryType.Snapshot, "image/x-j2c", "image/jp2", "j2c"),
-            new TypeMapping(AssetType.TextureTGA, InventoryType.Texture, "image/tga", "tga"),
-            new TypeMapping(AssetType.ImageTGA, InventoryType.Texture, "image/tga", "tga"),
-            new TypeMapping(AssetType.ImageJPEG, InventoryType.Texture, "image/jpeg", "jpg"),
-            new TypeMapping(AssetType.Sound, InventoryType.Sound, "audio/ogg", "application/ogg", "ogg"),
-            new TypeMapping(AssetType.SoundWAV, InventoryType.Sound, "audio/x-wav", "wav"),
-            new TypeMapping(AssetType.CallingCard, InventoryType.CallingCard, "application/vnd.ll.callingcard", "application/x-metaverse-callingcard", "callingcard"),
-            new TypeMapping(AssetType.Landmark, InventoryType.Landmark, "application/vnd.ll.landmark", "application/x-metaverse-landmark", "landmark"),
-            new TypeMapping(AssetType.Clothing, InventoryType.Wearable, "application/vnd.ll.clothing", "application/x-metaverse-clothing", "clothing"),
-            new TypeMapping(AssetType.Object, InventoryType.Object, "application/vnd.ll.primitive", "application/x-metaverse-primitive", "primitive"),
-            new TypeMapping(AssetType.Object, InventoryType.Attachment, "application/vnd.ll.primitive", "application/x-metaverse-primitive", "primitive"),
-            new TypeMapping(AssetType.Notecard, InventoryType.Notecard, "application/vnd.ll.notecard", "application/x-metaverse-notecard", "notecard"),
-            new TypeMapping(AssetType.Folder, InventoryType.Folder, "application/vnd.ll.folder", "folder"),
-            new TypeMapping(AssetType.RootFolder, InventoryType.RootCategory, "application/vnd.ll.rootfolder", "rootfolder"),
-            new TypeMapping(AssetType.LSLText, InventoryType.LSL, "application/vnd.ll.lsltext", "application/x-metaverse-lsl", "lsl"),
-            new TypeMapping(AssetType.LSLBytecode, InventoryType.LSL, "application/vnd.ll.lslbyte", "application/x-metaverse-lso", "lso"),
-            new TypeMapping(AssetType.Bodypart, InventoryType.Wearable, "application/vnd.ll.bodypart", "application/x-metaverse-bodypart", "bodypart"),
-            new TypeMapping(AssetType.TrashFolder, InventoryType.Folder, "application/vnd.ll.trashfolder", "trashfolder"),
-            new TypeMapping(AssetType.SnapshotFolder, InventoryType.Folder, "application/vnd.ll.snapshotfolder", "snapshotfolder"),
-            new TypeMapping(AssetType.LostAndFoundFolder, InventoryType.Folder, "application/vnd.ll.lostandfoundfolder", "lostandfoundfolder"),
-            new TypeMapping(AssetType.Animation, InventoryType.Animation, "application/vnd.ll.animation", "application/x-metaverse-animation", "animation"),
-            new TypeMapping(AssetType.Gesture, InventoryType.Gesture, "application/vnd.ll.gesture", "application/x-metaverse-gesture", "gesture"),
-            new TypeMapping(AssetType.Simstate, InventoryType.Snapshot, "application/x-metaverse-simstate", "simstate"),
-            new TypeMapping(AssetType.FavoriteFolder, InventoryType.Unknown, "application/vnd.ll.favoritefolder", "favoritefolder"),
-            new TypeMapping(AssetType.Link, InventoryType.Unknown, "application/vnd.ll.link", "link"),
-            new TypeMapping(AssetType.LinkFolder, InventoryType.Unknown, "application/vnd.ll.linkfolder", "linkfolder"),
-            new TypeMapping(AssetType.CurrentOutfitFolder, InventoryType.Unknown, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"),
-            new TypeMapping(AssetType.OutfitFolder, InventoryType.Unknown, "application/vnd.ll.outfitfolder", "outfitfolder"),
-            new TypeMapping(AssetType.MyOutfitsFolder, InventoryType.Unknown, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"),
-            new TypeMapping(AssetType.Mesh, InventoryType.Mesh, "application/vnd.ll.mesh", "llm")
-        };
-        private static Dictionary<sbyte, string> asset2Content;
-        private static Dictionary<sbyte, string> asset2Extension;
-        private static Dictionary<InventoryType, string> inventory2Content;
-        private static Dictionary<string, sbyte> content2Asset;
-        private static Dictionary<string, InventoryType> content2Inventory;
-        static SLUtil()
        {
-            asset2Content = new Dictionary<sbyte, string>();
+            switch ((InventoryType)invType)
-            asset2Extension = new Dictionary<sbyte, string>();
-            inventory2Content = new Dictionary<InventoryType, string>();
-            content2Asset = new Dictionary<string, sbyte>();
-            content2Inventory = new Dictionary<string, InventoryType>();
-            
-            foreach (TypeMapping mapping in MAPPINGS)
            {
-                sbyte assetType = mapping.AssetTypeCode;
+                case InventoryType.Animation:
-                if (!asset2Content.ContainsKey(assetType))
+                    return "application/vnd.ll.animation";
-                    asset2Content.Add(assetType, mapping.ContentType);
+                case InventoryType.CallingCard:
-                if (!asset2Extension.ContainsKey(assetType))
+                    return "application/vnd.ll.callingcard";
-                    asset2Extension.Add(assetType, mapping.Extension);
+                case InventoryType.Folder:
-                if (!inventory2Content.ContainsKey(mapping.InventoryType))
+                    return "application/vnd.ll.folder";
-                    inventory2Content.Add(mapping.InventoryType, mapping.ContentType);
+                case InventoryType.Gesture:
-                if (!content2Asset.ContainsKey(mapping.ContentType))
+                    return "application/vnd.ll.gesture";
-                    content2Asset.Add(mapping.ContentType, assetType);
+                case InventoryType.Landmark:
-                if (!content2Inventory.ContainsKey(mapping.ContentType))
+                    return "application/vnd.ll.landmark";
-                    content2Inventory.Add(mapping.ContentType, mapping.InventoryType);
+                case InventoryType.LSL:
+                    return "application/vnd.ll.lsltext";
-                if (mapping.ContentType2 != null)
+                case InventoryType.Notecard:
-                {
+                    return "application/vnd.ll.notecard";
-                    if (!content2Asset.ContainsKey(mapping.ContentType2))
+                case InventoryType.Attachment:
-                        content2Asset.Add(mapping.ContentType2, assetType);
+                case InventoryType.Object:
-                    if (!content2Inventory.ContainsKey(mapping.ContentType2))
+                    return "application/vnd.ll.primitive";
-                        content2Inventory.Add(mapping.ContentType2, mapping.InventoryType);
+                case InventoryType.Sound:
-                }
+                    return "audio/ogg";
+                case InventoryType.Snapshot:
+                case InventoryType.Texture:
+                    return "image/x-j2c";
+                case InventoryType.Wearable:
+                    return "application/vnd.ll.clothing";
+                default:
+                    return "application/octet-stream";
            }
        }
-        
-        public static string SLAssetTypeToContentType(int assetType)
-        {
-            string contentType;
-            if (!asset2Content.TryGetValue((sbyte)assetType, out contentType))
-                contentType = asset2Content[(sbyte)AssetType.Unknown];
-            return contentType;
-        }
-        public static string SLInvTypeToContentType(int invType)
-        {
-            string contentType;
-            if (!inventory2Content.TryGetValue((InventoryType)invType, out contentType))
-                contentType = inventory2Content[InventoryType.Unknown];
-            return contentType;
-        }
        public static sbyte ContentTypeToSLAssetType(string contentType)
        {
-            sbyte assetType;
+            switch (contentType)
-            if (!content2Asset.TryGetValue(contentType, out assetType))
+            {
-                assetType = (sbyte)AssetType.Unknown;
+                case "image/x-j2c":
-            return (sbyte)assetType;
+                case "image/jp2":
+                    return (sbyte)AssetType.Texture;
+                case "application/ogg":
+                case "audio/ogg":
+                    return (sbyte)AssetType.Sound;
+                case "application/vnd.ll.callingcard":
+                case "application/x-metaverse-callingcard":
+                    return (sbyte)AssetType.CallingCard;
+                case "application/vnd.ll.landmark":
+                case "application/x-metaverse-landmark":
+                    return (sbyte)AssetType.Landmark;
+                case "application/vnd.ll.clothing":
+                case "application/x-metaverse-clothing":
+                    return (sbyte)AssetType.Clothing;
+                case "application/vnd.ll.primitive":
+                case "application/x-metaverse-primitive":
+                    return (sbyte)AssetType.Object;
+                case "application/vnd.ll.notecard":
+                case "application/x-metaverse-notecard":
+                    return (sbyte)AssetType.Notecard;
+                case "application/vnd.ll.folder":
+                    return (sbyte)AssetType.Folder;
+                case "application/vnd.ll.rootfolder":
+                    return (sbyte)AssetType.RootFolder;
+                case "application/vnd.ll.lsltext":
+                case "application/x-metaverse-lsl":
+                    return (sbyte)AssetType.LSLText;
+                case "application/vnd.ll.lslbyte":
+                case "application/x-metaverse-lso":
+                    return (sbyte)AssetType.LSLBytecode;
+                case "image/tga":
+                    // Note that AssetType.TextureTGA will be converted to AssetType.ImageTGA
+                    return (sbyte)AssetType.ImageTGA;
+                case "application/vnd.ll.bodypart":
+                case "application/x-metaverse-bodypart":
+                    return (sbyte)AssetType.Bodypart;
+                case "application/vnd.ll.trashfolder":
+                    return (sbyte)AssetType.TrashFolder;
+                case "application/vnd.ll.snapshotfolder":
+                    return (sbyte)AssetType.SnapshotFolder;
+                case "application/vnd.ll.lostandfoundfolder":
+                    return (sbyte)AssetType.LostAndFoundFolder;
+                case "audio/x-wav":
+                    return (sbyte)AssetType.SoundWAV;
+                case "image/jpeg":
+                    return (sbyte)AssetType.ImageJPEG;
+                case "application/vnd.ll.animation":
+                case "application/x-metaverse-animation":
+                    return (sbyte)AssetType.Animation;
+                case "application/vnd.ll.gesture":
+                case "application/x-metaverse-gesture":
+                    return (sbyte)AssetType.Gesture;
+                case "application/x-metaverse-simstate":
+                    return (sbyte)AssetType.Simstate;
+                case "application/vnd.ll.favoritefolder":
+                    return (sbyte)AssetType.FavoriteFolder;
+                case "application/vnd.ll.link":
+                    return (sbyte)AssetType.Link;
+                case "application/vnd.ll.linkfolder":
+                    return (sbyte)AssetType.LinkFolder;
+                case "application/vnd.ll.currentoutfitfolder":
+                    return (sbyte)AssetType.CurrentOutfitFolder;
+                case "application/vnd.ll.outfitfolder":
+                    return (sbyte)AssetType.OutfitFolder;
+                case "application/vnd.ll.myoutfitsfolder":
+                    return (sbyte)AssetType.MyOutfitsFolder;
+                case "application/octet-stream":
+                default:
+                    return (sbyte)AssetType.Unknown;
+            }
        }
        public static sbyte ContentTypeToSLInvType(string contentType)
        {
-            InventoryType invType;
+            switch (contentType)
-            if (!content2Inventory.TryGetValue(contentType, out invType))
+            {
-                invType = InventoryType.Unknown;
+                case "image/x-j2c":
-            return (sbyte)invType;
+                case "image/jp2":
-        }
+                case "image/tga":
+                case "image/jpeg":
-        public static string SLAssetTypeToExtension(int assetType)
+                    return (sbyte)InventoryType.Texture;
-        {
+                case "application/ogg":
-            string extension;
+                case "audio/ogg":
-            if (!asset2Extension.TryGetValue((sbyte)assetType, out extension))
+                case "audio/x-wav":
-                extension = asset2Extension[(sbyte)AssetType.Unknown];
+                    return (sbyte)InventoryType.Sound;
-            return extension;
+                case "application/vnd.ll.callingcard":
+                case "application/x-metaverse-callingcard":
+                    return (sbyte)InventoryType.CallingCard;
+                case "application/vnd.ll.landmark":
+                case "application/x-metaverse-landmark":
+                    return (sbyte)InventoryType.Landmark;
+                case "application/vnd.ll.clothing":
+                case "application/x-metaverse-clothing":
+                case "application/vnd.ll.bodypart":
+                case "application/x-metaverse-bodypart":
+                    return (sbyte)InventoryType.Wearable;
+                case "application/vnd.ll.primitive":
+                case "application/x-metaverse-primitive":
+                    return (sbyte)InventoryType.Object;
+                case "application/vnd.ll.notecard":
+                case "application/x-metaverse-notecard":
+                    return (sbyte)InventoryType.Notecard;
+                case "application/vnd.ll.folder":
+                    return (sbyte)InventoryType.Folder;
+                case "application/vnd.ll.rootfolder":
+                    return (sbyte)InventoryType.RootCategory;
+                case "application/vnd.ll.lsltext":
+                case "application/x-metaverse-lsl":
+                case "application/vnd.ll.lslbyte":
+                case "application/x-metaverse-lso":
+                    return (sbyte)InventoryType.LSL;
+                case "application/vnd.ll.trashfolder":
+                case "application/vnd.ll.snapshotfolder":
+                case "application/vnd.ll.lostandfoundfolder":
+                    return (sbyte)InventoryType.Folder;
+                case "application/vnd.ll.animation":
+                case "application/x-metaverse-animation":
+                    return (sbyte)InventoryType.Animation;
+                case "application/vnd.ll.gesture":
+                case "application/x-metaverse-gesture":
+                    return (sbyte)InventoryType.Gesture;
+                case "application/x-metaverse-simstate":
+                    return (sbyte)InventoryType.Snapshot;
+                case "application/octet-stream":
+                default:
+                    return (sbyte)InventoryType.Unknown;
+            }
        }
        #endregion SL / file extension / content-type conversions
@@ -327,4 +377,4 @@ namespace OpenSim.Framework
            return output;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index f0d2a3f..1ca35df 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -214,13 +214,16 @@ namespace OpenSim.Framework.Tests
            for (int i = 0; i < contenttypes.Length; i++)
            {
-                int expected;
+                if (SLUtil.ContentTypeToSLAssetType(contenttypes[i]) == 18)
-                if (contenttypes[i] == "image/tga")
+                {
-                    expected = 12;  // if we know only the content-type "image/tga", then we assume the asset type is TextureTGA; not ImageTGA
+                    Assert.That(contenttypes[i] == "image/tga");
+                }
                else
-                    expected = assettypes[i];
+                {
-                Assert.AreEqual(expected, SLUtil.ContentTypeToSLAssetType(contenttypes[i]),
+                    Assert.That(SLUtil.ContentTypeToSLAssetType(contenttypes[i]) == assettypes[i],
-                            String.Format("Incorrect AssetType mapped from Content-Type {0}", contenttypes[i]));
+                                "Expecting {0} but got {1}", assettypes[i],
+                                SLUtil.ContentTypeToSLAssetType(contenttypes[i]));
+                }
            }
            int[] inventorytypes = new int[] {-1,0,1,2,3,6,7,8,9,10,15,17,18,20};
@@ -234,7 +237,7 @@ namespace OpenSim.Framework.Tests
                                               "application/vnd.ll.primitive",
                                               "application/vnd.ll.notecard",
                                               "application/vnd.ll.folder",
-                                               "application/vnd.ll.rootfolder",
+                                               "application/octet-stream",
                                               "application/vnd.ll.lsltext",
                                               "image/x-j2c",
                                               "application/vnd.ll.primitive",
@@ -244,8 +247,7 @@ namespace OpenSim.Framework.Tests
        
            for (int i=0;i<inventorytypes.Length;i++)
            {
-                Assert.AreEqual(invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]),
+                Assert.That(SLUtil.SLInvTypeToContentType(inventorytypes[i]) == invcontenttypes[i], "Expected {0}, Got {1}", invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]));
-                    String.Format("Incorrect Content-Type mapped from InventoryType {0}", inventorytypes[i]));
            }
            invcontenttypes = new string[]
@@ -278,8 +280,7 @@ namespace OpenSim.Framework.Tests
            for (int i = 0; i < invtypes.Length; i++)
            {
-                Assert.AreEqual(invtypes[i], SLUtil.ContentTypeToSLInvType(invcontenttypes[i]),
+                Assert.That(SLUtil.ContentTypeToSLInvType(invcontenttypes[i]) == invtypes[i], "Expected {0}, Got {1}", invtypes[i], SLUtil.ContentTypeToSLInvType(invcontenttypes[i]));
-                    String.Format("Incorrect InventoryType mapped from Content-Type {0}", invcontenttypes[i]));
            }
        }
    }

diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs index 537de7a..db4541e 100644 --- a/OpenSim/Framework/SLUtil.cs +++ b/OpenSim/Framework/SLUtil.cs
@@ -38,189 +38,239 @@ namespace OpenSim.Framework
38	public static class SLUtil	38	public static class SLUtil
39	{	39	{
40	// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	40	// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41		41
42	#region SL / file extension / content-type conversions	42	#region SL / file extension / content-type conversions
43		43
44	private class TypeMapping	44	public static string SLAssetTypeToContentType(int assetType)
45	{	45	{
46	private sbyte assetType;	46	switch ((AssetType)assetType)
47	private InventoryType inventoryType;
48	private string contentType;
49	private string contentType2;
50	private string extension;
51
52	public sbyte AssetTypeCode
53	{
54	get { return assetType; }
55	}
56
57	public object AssetType
58	{
59	get {
60	if (Enum.IsDefined(typeof(OpenMetaverse.AssetType), assetType))
61	return (OpenMetaverse.AssetType)assetType;
62	else
63	return OpenMetaverse.AssetType.Unknown;
64	}
65	}
66
67	public InventoryType InventoryType
68	{
69	get { return inventoryType; }
70	}
71
72	public string ContentType
73	{
74	get { return contentType; }
75	}
76
77	public string ContentType2
78	{
79	get { return contentType2; }
80	}
81
82	public string Extension
83	{
84	get { return extension; }
85	}
86
87	private TypeMapping(sbyte assetType, InventoryType inventoryType, string contentType, string contentType2, string extension)
88	{
89	this.assetType = assetType;
90	this.inventoryType = inventoryType;
91	this.contentType = contentType;
92	this.contentType2 = contentType2;
93	this.extension = extension;
94	}
95
96	public TypeMapping(AssetType assetType, InventoryType inventoryType, string contentType, string contentType2, string extension)
97	: this((sbyte)assetType, inventoryType, contentType, contentType2, extension)
98	{
99	}
100
101	public TypeMapping(AssetType assetType, InventoryType inventoryType, string contentType, string extension)
102	: this((sbyte)assetType, inventoryType, contentType, null, extension)
103	{	47	{
		48	case AssetType.Texture:
		49	return "image/x-j2c";
		50	case AssetType.Sound:
		51	return "audio/ogg";
		52	case AssetType.CallingCard:
		53	return "application/vnd.ll.callingcard";
		54	case AssetType.Landmark:
		55	return "application/vnd.ll.landmark";
		56	case AssetType.Clothing:
		57	return "application/vnd.ll.clothing";
		58	case AssetType.Object:
		59	return "application/vnd.ll.primitive";
		60	case AssetType.Notecard:
		61	return "application/vnd.ll.notecard";
		62	case AssetType.Folder:
		63	return "application/vnd.ll.folder";
		64	case AssetType.RootFolder:
		65	return "application/vnd.ll.rootfolder";
		66	case AssetType.LSLText:
		67	return "application/vnd.ll.lsltext";
		68	case AssetType.LSLBytecode:
		69	return "application/vnd.ll.lslbyte";
		70	case AssetType.TextureTGA:
		71	case AssetType.ImageTGA:
		72	return "image/tga";
		73	case AssetType.Bodypart:
		74	return "application/vnd.ll.bodypart";
		75	case AssetType.TrashFolder:
		76	return "application/vnd.ll.trashfolder";
		77	case AssetType.SnapshotFolder:
		78	return "application/vnd.ll.snapshotfolder";
		79	case AssetType.LostAndFoundFolder:
		80	return "application/vnd.ll.lostandfoundfolder";
		81	case AssetType.SoundWAV:
		82	return "audio/x-wav";
		83	case AssetType.ImageJPEG:
		84	return "image/jpeg";
		85	case AssetType.Animation:
		86	return "application/vnd.ll.animation";
		87	case AssetType.Gesture:
		88	return "application/vnd.ll.gesture";
		89	case AssetType.Simstate:
		90	return "application/x-metaverse-simstate";
		91	case AssetType.FavoriteFolder:
		92	return "application/vnd.ll.favoritefolder";
		93	case AssetType.Link:
		94	return "application/vnd.ll.link";
		95	case AssetType.LinkFolder:
		96	return "application/vnd.ll.linkfolder";
		97	case AssetType.CurrentOutfitFolder:
		98	return "application/vnd.ll.currentoutfitfolder";
		99	case AssetType.OutfitFolder:
		100	return "application/vnd.ll.outfitfolder";
		101	case AssetType.MyOutfitsFolder:
		102	return "application/vnd.ll.myoutfitsfolder";
		103	case AssetType.Unknown:
		104	default:
		105	return "application/octet-stream";
104	}	106	}
105	}	107	}
106		108
107	/// <summary>	109	public static string SLInvTypeToContentType(int invType)
108	/// Maps between AssetType, InventoryType and Content-Type.
109	/// Where more than one possibility exists, the first one takes precedence. E.g.:
110	/// AssetType "AssetType.Texture" -> Content-Type "image-xj2c"
111	/// Content-Type "image/x-j2c" -> InventoryType "InventoryType.Texture"
112	/// </summary>
113	private static TypeMapping[] MAPPINGS = new TypeMapping[] {
114	new TypeMapping(AssetType.Unknown, InventoryType.Unknown, "application/octet-stream", "bin"),
115	new TypeMapping(AssetType.Texture, InventoryType.Texture, "image/x-j2c", "image/jp2", "j2c"),
116	new TypeMapping(AssetType.Texture, InventoryType.Snapshot, "image/x-j2c", "image/jp2", "j2c"),
117	new TypeMapping(AssetType.TextureTGA, InventoryType.Texture, "image/tga", "tga"),
118	new TypeMapping(AssetType.ImageTGA, InventoryType.Texture, "image/tga", "tga"),
119	new TypeMapping(AssetType.ImageJPEG, InventoryType.Texture, "image/jpeg", "jpg"),
120	new TypeMapping(AssetType.Sound, InventoryType.Sound, "audio/ogg", "application/ogg", "ogg"),
121	new TypeMapping(AssetType.SoundWAV, InventoryType.Sound, "audio/x-wav", "wav"),
122	new TypeMapping(AssetType.CallingCard, InventoryType.CallingCard, "application/vnd.ll.callingcard", "application/x-metaverse-callingcard", "callingcard"),
123	new TypeMapping(AssetType.Landmark, InventoryType.Landmark, "application/vnd.ll.landmark", "application/x-metaverse-landmark", "landmark"),
124	new TypeMapping(AssetType.Clothing, InventoryType.Wearable, "application/vnd.ll.clothing", "application/x-metaverse-clothing", "clothing"),
125	new TypeMapping(AssetType.Object, InventoryType.Object, "application/vnd.ll.primitive", "application/x-metaverse-primitive", "primitive"),
126	new TypeMapping(AssetType.Object, InventoryType.Attachment, "application/vnd.ll.primitive", "application/x-metaverse-primitive", "primitive"),
127	new TypeMapping(AssetType.Notecard, InventoryType.Notecard, "application/vnd.ll.notecard", "application/x-metaverse-notecard", "notecard"),
128	new TypeMapping(AssetType.Folder, InventoryType.Folder, "application/vnd.ll.folder", "folder"),
129	new TypeMapping(AssetType.RootFolder, InventoryType.RootCategory, "application/vnd.ll.rootfolder", "rootfolder"),
130	new TypeMapping(AssetType.LSLText, InventoryType.LSL, "application/vnd.ll.lsltext", "application/x-metaverse-lsl", "lsl"),
131	new TypeMapping(AssetType.LSLBytecode, InventoryType.LSL, "application/vnd.ll.lslbyte", "application/x-metaverse-lso", "lso"),
132	new TypeMapping(AssetType.Bodypart, InventoryType.Wearable, "application/vnd.ll.bodypart", "application/x-metaverse-bodypart", "bodypart"),
133	new TypeMapping(AssetType.TrashFolder, InventoryType.Folder, "application/vnd.ll.trashfolder", "trashfolder"),
134	new TypeMapping(AssetType.SnapshotFolder, InventoryType.Folder, "application/vnd.ll.snapshotfolder", "snapshotfolder"),
135	new TypeMapping(AssetType.LostAndFoundFolder, InventoryType.Folder, "application/vnd.ll.lostandfoundfolder", "lostandfoundfolder"),
136	new TypeMapping(AssetType.Animation, InventoryType.Animation, "application/vnd.ll.animation", "application/x-metaverse-animation", "animation"),
137	new TypeMapping(AssetType.Gesture, InventoryType.Gesture, "application/vnd.ll.gesture", "application/x-metaverse-gesture", "gesture"),
138	new TypeMapping(AssetType.Simstate, InventoryType.Snapshot, "application/x-metaverse-simstate", "simstate"),
139	new TypeMapping(AssetType.FavoriteFolder, InventoryType.Unknown, "application/vnd.ll.favoritefolder", "favoritefolder"),
140	new TypeMapping(AssetType.Link, InventoryType.Unknown, "application/vnd.ll.link", "link"),
141	new TypeMapping(AssetType.LinkFolder, InventoryType.Unknown, "application/vnd.ll.linkfolder", "linkfolder"),
142	new TypeMapping(AssetType.CurrentOutfitFolder, InventoryType.Unknown, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"),
143	new TypeMapping(AssetType.OutfitFolder, InventoryType.Unknown, "application/vnd.ll.outfitfolder", "outfitfolder"),
144	new TypeMapping(AssetType.MyOutfitsFolder, InventoryType.Unknown, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"),
145	new TypeMapping(AssetType.Mesh, InventoryType.Mesh, "application/vnd.ll.mesh", "llm")
146	};
147
148	private static Dictionary<sbyte, string> asset2Content;
149	private static Dictionary<sbyte, string> asset2Extension;
150	private static Dictionary<InventoryType, string> inventory2Content;
151	private static Dictionary<string, sbyte> content2Asset;
152	private static Dictionary<string, InventoryType> content2Inventory;
153
154	static SLUtil()
155	{	110	{
156	asset2Content = new Dictionary<sbyte, string>();	111	switch ((InventoryType)invType)
157	asset2Extension = new Dictionary<sbyte, string>();
158	inventory2Content = new Dictionary<InventoryType, string>();
159	content2Asset = new Dictionary<string, sbyte>();
160	content2Inventory = new Dictionary<string, InventoryType>();
161
162	foreach (TypeMapping mapping in MAPPINGS)
163	{	112	{
164	sbyte assetType = mapping.AssetTypeCode;	113	case InventoryType.Animation:
165	if (!asset2Content.ContainsKey(assetType))	114	return "application/vnd.ll.animation";
166	asset2Content.Add(assetType, mapping.ContentType);	115	case InventoryType.CallingCard:
167	if (!asset2Extension.ContainsKey(assetType))	116	return "application/vnd.ll.callingcard";
168	asset2Extension.Add(assetType, mapping.Extension);	117	case InventoryType.Folder:
169	if (!inventory2Content.ContainsKey(mapping.InventoryType))	118	return "application/vnd.ll.folder";
170	inventory2Content.Add(mapping.InventoryType, mapping.ContentType);	119	case InventoryType.Gesture:
171	if (!content2Asset.ContainsKey(mapping.ContentType))	120	return "application/vnd.ll.gesture";
172	content2Asset.Add(mapping.ContentType, assetType);	121	case InventoryType.Landmark:
173	if (!content2Inventory.ContainsKey(mapping.ContentType))	122	return "application/vnd.ll.landmark";
174	content2Inventory.Add(mapping.ContentType, mapping.InventoryType);	123	case InventoryType.LSL:
175		124	return "application/vnd.ll.lsltext";
176	if (mapping.ContentType2 != null)	125	case InventoryType.Notecard:
177	{	126	return "application/vnd.ll.notecard";
178	if (!content2Asset.ContainsKey(mapping.ContentType2))	127	case InventoryType.Attachment:
179	content2Asset.Add(mapping.ContentType2, assetType);	128	case InventoryType.Object:
180	if (!content2Inventory.ContainsKey(mapping.ContentType2))	129	return "application/vnd.ll.primitive";
181	content2Inventory.Add(mapping.ContentType2, mapping.InventoryType);	130	case InventoryType.Sound:
182	}	131	return "audio/ogg";
		132	case InventoryType.Snapshot:
		133	case InventoryType.Texture:
		134	return "image/x-j2c";
		135	case InventoryType.Wearable:
		136	return "application/vnd.ll.clothing";
		137	default:
		138	return "application/octet-stream";
183	}	139	}
184	}	140	}
185
186	public static string SLAssetTypeToContentType(int assetType)
187	{
188	string contentType;
189	if (!asset2Content.TryGetValue((sbyte)assetType, out contentType))
190	contentType = asset2Content[(sbyte)AssetType.Unknown];
191	return contentType;
192	}
193
194	public static string SLInvTypeToContentType(int invType)
195	{
196	string contentType;
197	if (!inventory2Content.TryGetValue((InventoryType)invType, out contentType))
198	contentType = inventory2Content[InventoryType.Unknown];
199	return contentType;
200	}
201		141
202	public static sbyte ContentTypeToSLAssetType(string contentType)	142	public static sbyte ContentTypeToSLAssetType(string contentType)
203	{	143	{
204	sbyte assetType;	144	switch (contentType)
205	if (!content2Asset.TryGetValue(contentType, out assetType))	145	{
206	assetType = (sbyte)AssetType.Unknown;	146	case "image/x-j2c":
207	return (sbyte)assetType;	147	case "image/jp2":
		148	return (sbyte)AssetType.Texture;
		149	case "application/ogg":
		150	case "audio/ogg":
		151	return (sbyte)AssetType.Sound;
		152	case "application/vnd.ll.callingcard":
		153	case "application/x-metaverse-callingcard":
		154	return (sbyte)AssetType.CallingCard;
		155	case "application/vnd.ll.landmark":
		156	case "application/x-metaverse-landmark":
		157	return (sbyte)AssetType.Landmark;
		158	case "application/vnd.ll.clothing":
		159	case "application/x-metaverse-clothing":
		160	return (sbyte)AssetType.Clothing;
		161	case "application/vnd.ll.primitive":
		162	case "application/x-metaverse-primitive":
		163	return (sbyte)AssetType.Object;
		164	case "application/vnd.ll.notecard":
		165	case "application/x-metaverse-notecard":
		166	return (sbyte)AssetType.Notecard;
		167	case "application/vnd.ll.folder":
		168	return (sbyte)AssetType.Folder;
		169	case "application/vnd.ll.rootfolder":
		170	return (sbyte)AssetType.RootFolder;
		171	case "application/vnd.ll.lsltext":
		172	case "application/x-metaverse-lsl":
		173	return (sbyte)AssetType.LSLText;
		174	case "application/vnd.ll.lslbyte":
		175	case "application/x-metaverse-lso":
		176	return (sbyte)AssetType.LSLBytecode;
		177	case "image/tga":
		178	// Note that AssetType.TextureTGA will be converted to AssetType.ImageTGA
		179	return (sbyte)AssetType.ImageTGA;
		180	case "application/vnd.ll.bodypart":
		181	case "application/x-metaverse-bodypart":
		182	return (sbyte)AssetType.Bodypart;
		183	case "application/vnd.ll.trashfolder":
		184	return (sbyte)AssetType.TrashFolder;
		185	case "application/vnd.ll.snapshotfolder":
		186	return (sbyte)AssetType.SnapshotFolder;
		187	case "application/vnd.ll.lostandfoundfolder":
		188	return (sbyte)AssetType.LostAndFoundFolder;
		189	case "audio/x-wav":
		190	return (sbyte)AssetType.SoundWAV;
		191	case "image/jpeg":
		192	return (sbyte)AssetType.ImageJPEG;
		193	case "application/vnd.ll.animation":
		194	case "application/x-metaverse-animation":
		195	return (sbyte)AssetType.Animation;
		196	case "application/vnd.ll.gesture":
		197	case "application/x-metaverse-gesture":
		198	return (sbyte)AssetType.Gesture;
		199	case "application/x-metaverse-simstate":
		200	return (sbyte)AssetType.Simstate;
		201	case "application/vnd.ll.favoritefolder":
		202	return (sbyte)AssetType.FavoriteFolder;
		203	case "application/vnd.ll.link":
		204	return (sbyte)AssetType.Link;
		205	case "application/vnd.ll.linkfolder":
		206	return (sbyte)AssetType.LinkFolder;
		207	case "application/vnd.ll.currentoutfitfolder":
		208	return (sbyte)AssetType.CurrentOutfitFolder;
		209	case "application/vnd.ll.outfitfolder":
		210	return (sbyte)AssetType.OutfitFolder;
		211	case "application/vnd.ll.myoutfitsfolder":
		212	return (sbyte)AssetType.MyOutfitsFolder;
		213	case "application/octet-stream":
		214	default:
		215	return (sbyte)AssetType.Unknown;
		216	}
208	}	217	}
209		218
210	public static sbyte ContentTypeToSLInvType(string contentType)	219	public static sbyte ContentTypeToSLInvType(string contentType)
211	{	220	{
212	InventoryType invType;	221	switch (contentType)
213	if (!content2Inventory.TryGetValue(contentType, out invType))	222	{
214	invType = InventoryType.Unknown;	223	case "image/x-j2c":
215	return (sbyte)invType;	224	case "image/jp2":
216	}	225	case "image/tga":
217		226	case "image/jpeg":
218	public static string SLAssetTypeToExtension(int assetType)	227	return (sbyte)InventoryType.Texture;
219	{	228	case "application/ogg":
220	string extension;	229	case "audio/ogg":
221	if (!asset2Extension.TryGetValue((sbyte)assetType, out extension))	230	case "audio/x-wav":
222	extension = asset2Extension[(sbyte)AssetType.Unknown];	231	return (sbyte)InventoryType.Sound;
223	return extension;	232	case "application/vnd.ll.callingcard":
		233	case "application/x-metaverse-callingcard":
		234	return (sbyte)InventoryType.CallingCard;
		235	case "application/vnd.ll.landmark":
		236	case "application/x-metaverse-landmark":
		237	return (sbyte)InventoryType.Landmark;
		238	case "application/vnd.ll.clothing":
		239	case "application/x-metaverse-clothing":
		240	case "application/vnd.ll.bodypart":
		241	case "application/x-metaverse-bodypart":
		242	return (sbyte)InventoryType.Wearable;
		243	case "application/vnd.ll.primitive":
		244	case "application/x-metaverse-primitive":
		245	return (sbyte)InventoryType.Object;
		246	case "application/vnd.ll.notecard":
		247	case "application/x-metaverse-notecard":
		248	return (sbyte)InventoryType.Notecard;
		249	case "application/vnd.ll.folder":
		250	return (sbyte)InventoryType.Folder;
		251	case "application/vnd.ll.rootfolder":
		252	return (sbyte)InventoryType.RootCategory;
		253	case "application/vnd.ll.lsltext":
		254	case "application/x-metaverse-lsl":
		255	case "application/vnd.ll.lslbyte":
		256	case "application/x-metaverse-lso":
		257	return (sbyte)InventoryType.LSL;
		258	case "application/vnd.ll.trashfolder":
		259	case "application/vnd.ll.snapshotfolder":
		260	case "application/vnd.ll.lostandfoundfolder":
		261	return (sbyte)InventoryType.Folder;
		262	case "application/vnd.ll.animation":
		263	case "application/x-metaverse-animation":
		264	return (sbyte)InventoryType.Animation;
		265	case "application/vnd.ll.gesture":
		266	case "application/x-metaverse-gesture":
		267	return (sbyte)InventoryType.Gesture;
		268	case "application/x-metaverse-simstate":
		269	return (sbyte)InventoryType.Snapshot;
		270	case "application/octet-stream":
		271	default:
		272	return (sbyte)InventoryType.Unknown;
		273	}
224	}	274	}
225		275
226	#endregion SL / file extension / content-type conversions	276	#endregion SL / file extension / content-type conversions
@@ -327,4 +377,4 @@ namespace OpenSim.Framework
327	return output;	377	return output;
328	}	378	}
329	}	379	}
330	}	380	} \ No newline at end of file


diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs index f0d2a3f..1ca35df 100644 --- a/OpenSim/Framework/Tests/UtilTest.cs +++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -214,13 +214,16 @@ namespace OpenSim.Framework.Tests
214		214
215	for (int i = 0; i < contenttypes.Length; i++)	215	for (int i = 0; i < contenttypes.Length; i++)
216	{	216	{
217	int expected;	217	if (SLUtil.ContentTypeToSLAssetType(contenttypes[i]) == 18)
218	if (contenttypes[i] == "image/tga")	218	{
219	expected = 12; // if we know only the content-type "image/tga", then we assume the asset type is TextureTGA; not ImageTGA	219	Assert.That(contenttypes[i] == "image/tga");
		220	}
220	else	221	else
221	expected = assettypes[i];	222	{
222	Assert.AreEqual(expected, SLUtil.ContentTypeToSLAssetType(contenttypes[i]),	223	Assert.That(SLUtil.ContentTypeToSLAssetType(contenttypes[i]) == assettypes[i],
223	String.Format("Incorrect AssetType mapped from Content-Type {0}", contenttypes[i]));	224	"Expecting {0} but got {1}", assettypes[i],
		225	SLUtil.ContentTypeToSLAssetType(contenttypes[i]));
		226	}
224	}	227	}
225		228
226	int[] inventorytypes = new int[] {-1,0,1,2,3,6,7,8,9,10,15,17,18,20};	229	int[] inventorytypes = new int[] {-1,0,1,2,3,6,7,8,9,10,15,17,18,20};
@@ -234,7 +237,7 @@ namespace OpenSim.Framework.Tests
234	"application/vnd.ll.primitive",	237	"application/vnd.ll.primitive",
235	"application/vnd.ll.notecard",	238	"application/vnd.ll.notecard",
236	"application/vnd.ll.folder",	239	"application/vnd.ll.folder",
237	"application/vnd.ll.rootfolder",	240	"application/octet-stream",
238	"application/vnd.ll.lsltext",	241	"application/vnd.ll.lsltext",
239	"image/x-j2c",	242	"image/x-j2c",
240	"application/vnd.ll.primitive",	243	"application/vnd.ll.primitive",
@@ -244,8 +247,7 @@ namespace OpenSim.Framework.Tests
244		247
245	for (int i=0;i<inventorytypes.Length;i++)	248	for (int i=0;i<inventorytypes.Length;i++)
246	{	249	{
247	Assert.AreEqual(invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]),	250	Assert.That(SLUtil.SLInvTypeToContentType(inventorytypes[i]) == invcontenttypes[i], "Expected {0}, Got {1}", invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]));
248	String.Format("Incorrect Content-Type mapped from InventoryType {0}", inventorytypes[i]));
249	}	251	}
250		252
251	invcontenttypes = new string[]	253	invcontenttypes = new string[]
@@ -278,8 +280,7 @@ namespace OpenSim.Framework.Tests
278		280
279	for (int i = 0; i < invtypes.Length; i++)	281	for (int i = 0; i < invtypes.Length; i++)
280	{	282	{
281	Assert.AreEqual(invtypes[i], SLUtil.ContentTypeToSLInvType(invcontenttypes[i]),	283	Assert.That(SLUtil.ContentTypeToSLInvType(invcontenttypes[i]) == invtypes[i], "Expected {0}, Got {1}", invtypes[i], SLUtil.ContentTypeToSLInvType(invcontenttypes[i]));
282	String.Format("Incorrect InventoryType mapped from Content-Type {0}", invcontenttypes[i]));
283	}	284	}
284	}	285	}
285	}	286	}