diff options
| author | Justin Clark-Casey (justincc) | 2010-09-08 01:05:56 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-08 01:05:56 +0100 |
| commit | b8d14fcc4a7d819af5015144518ce31cd86d0383 (patch) | |
| tree | 67119cd2cb9bf00e7bbc9ef0e9c4f139f4dbc643 /OpenSim/Framework | |
| parent | If a scene object part UUID is changed (only possible when not in a scene), t... (diff) | |
| parent | Rolling back the recent libomv update but keeping the ExpiringCache cleanups ... (diff) | |
| download | opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.zip opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.gz opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.bz2 opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/SLUtil.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs index a489806..9941a7f 100644 --- a/OpenSim/Framework/SLUtil.cs +++ b/OpenSim/Framework/SLUtil.cs | |||
| @@ -46,7 +46,7 @@ namespace OpenSim.Framework | |||
| 46 | case AssetType.Texture: | 46 | case AssetType.Texture: |
| 47 | return "image/x-j2c"; | 47 | return "image/x-j2c"; |
| 48 | case AssetType.Sound: | 48 | case AssetType.Sound: |
| 49 | return "application/ogg"; | 49 | return "audio/ogg"; |
| 50 | case AssetType.CallingCard: | 50 | case AssetType.CallingCard: |
| 51 | return "application/vnd.ll.callingcard"; | 51 | return "application/vnd.ll.callingcard"; |
| 52 | case AssetType.Landmark: | 52 | case AssetType.Landmark: |
| @@ -98,8 +98,6 @@ namespace OpenSim.Framework | |||
| 98 | return "application/vnd.ll.outfitfolder"; | 98 | return "application/vnd.ll.outfitfolder"; |
| 99 | case AssetType.MyOutfitsFolder: | 99 | case AssetType.MyOutfitsFolder: |
| 100 | return "application/vnd.ll.myoutfitsfolder"; | 100 | return "application/vnd.ll.myoutfitsfolder"; |
| 101 | case AssetType.InboxFolder: | ||
| 102 | return "application/vnd.ll.inboxfolder"; | ||
| 103 | case AssetType.Unknown: | 101 | case AssetType.Unknown: |
| 104 | default: | 102 | default: |
| 105 | return "application/octet-stream"; | 103 | return "application/octet-stream"; |
| @@ -128,7 +126,7 @@ namespace OpenSim.Framework | |||
| 128 | case InventoryType.Object: | 126 | case InventoryType.Object: |
| 129 | return "application/vnd.ll.primitive"; | 127 | return "application/vnd.ll.primitive"; |
| 130 | case InventoryType.Sound: | 128 | case InventoryType.Sound: |
| 131 | return "application/ogg"; | 129 | return "audio/ogg"; |
| 132 | case InventoryType.Snapshot: | 130 | case InventoryType.Snapshot: |
| 133 | case InventoryType.Texture: | 131 | case InventoryType.Texture: |
| 134 | return "image/x-j2c"; | 132 | return "image/x-j2c"; |
| @@ -147,6 +145,7 @@ namespace OpenSim.Framework | |||
| 147 | case "image/jp2": | 145 | case "image/jp2": |
| 148 | return (sbyte)AssetType.Texture; | 146 | return (sbyte)AssetType.Texture; |
| 149 | case "application/ogg": | 147 | case "application/ogg": |
| 148 | case "audio/ogg": | ||
| 150 | return (sbyte)AssetType.Sound; | 149 | return (sbyte)AssetType.Sound; |
| 151 | case "application/vnd.ll.callingcard": | 150 | case "application/vnd.ll.callingcard": |
| 152 | case "application/x-metaverse-callingcard": | 151 | case "application/x-metaverse-callingcard": |
| @@ -209,8 +208,6 @@ namespace OpenSim.Framework | |||
| 209 | return (sbyte)AssetType.OutfitFolder; | 208 | return (sbyte)AssetType.OutfitFolder; |
| 210 | case "application/vnd.ll.myoutfitsfolder": | 209 | case "application/vnd.ll.myoutfitsfolder": |
| 211 | return (sbyte)AssetType.MyOutfitsFolder; | 210 | return (sbyte)AssetType.MyOutfitsFolder; |
| 212 | case "application/vnd.ll.inboxfolder": | ||
| 213 | return (sbyte)AssetType.InboxFolder; | ||
| 214 | case "application/octet-stream": | 211 | case "application/octet-stream": |
| 215 | default: | 212 | default: |
| 216 | return (sbyte)AssetType.Unknown; | 213 | return (sbyte)AssetType.Unknown; |
| @@ -227,6 +224,7 @@ namespace OpenSim.Framework | |||
| 227 | case "image/jpeg": | 224 | case "image/jpeg": |
| 228 | return (sbyte)InventoryType.Texture; | 225 | return (sbyte)InventoryType.Texture; |
| 229 | case "application/ogg": | 226 | case "application/ogg": |
| 227 | case "audio/ogg": | ||
| 230 | case "audio/x-wav": | 228 | case "audio/x-wav": |
| 231 | return (sbyte)InventoryType.Sound; | 229 | return (sbyte)InventoryType.Sound; |
| 232 | case "application/vnd.ll.callingcard": | 230 | case "application/vnd.ll.callingcard": |