diff options
Diffstat (limited to 'OpenSim/Server/Base')
-rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index a5d28a4..2fbcea4 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
@@ -34,55 +34,13 @@ using System.Text; | |||
34 | using System.Collections.Generic; | 34 | using System.Collections.Generic; |
35 | using log4net; | 35 | using log4net; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenMetaverse; | ||
37 | 38 | ||
38 | namespace OpenSim.Server.Base | 39 | namespace OpenSim.Server.Base |
39 | { | 40 | { |
40 | public static class ServerUtils | 41 | public static class ServerUtils |
41 | { | 42 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | |||
44 | public static string SLAssetTypeToContentType(int assetType) | ||
45 | { | ||
46 | switch (assetType) | ||
47 | { | ||
48 | case 0: | ||
49 | return "image/jp2"; | ||
50 | case 1: | ||
51 | return "application/ogg"; | ||
52 | case 2: | ||
53 | return "application/x-metaverse-callingcard"; | ||
54 | case 3: | ||
55 | return "application/x-metaverse-landmark"; | ||
56 | case 5: | ||
57 | return "application/x-metaverse-clothing"; | ||
58 | case 6: | ||
59 | return "application/x-metaverse-primitive"; | ||
60 | case 7: | ||
61 | return "application/x-metaverse-notecard"; | ||
62 | case 8: | ||
63 | return "application/x-metaverse-folder"; | ||
64 | case 10: | ||
65 | return "application/x-metaverse-lsl"; | ||
66 | case 11: | ||
67 | return "application/x-metaverse-lso"; | ||
68 | case 12: | ||
69 | return "image/tga"; | ||
70 | case 13: | ||
71 | return "application/x-metaverse-bodypart"; | ||
72 | case 17: | ||
73 | return "audio/x-wav"; | ||
74 | case 19: | ||
75 | return "image/jpeg"; | ||
76 | case 20: | ||
77 | return "application/x-metaverse-animation"; | ||
78 | case 21: | ||
79 | return "application/x-metaverse-gesture"; | ||
80 | case 22: | ||
81 | return "application/x-metaverse-simstate"; | ||
82 | default: | ||
83 | return "application/octet-stream"; | ||
84 | } | ||
85 | } | ||
86 | 44 | ||
87 | public static byte[] SerializeResult(XmlSerializer xs, object data) | 45 | public static byte[] SerializeResult(XmlSerializer xs, object data) |
88 | { | 46 | { |
@@ -278,6 +236,9 @@ namespace OpenSim.Server.Base | |||
278 | { | 236 | { |
279 | foreach (KeyValuePair<string, object> kvp in data) | 237 | foreach (KeyValuePair<string, object> kvp in data) |
280 | { | 238 | { |
239 | if (kvp.Value == null) | ||
240 | continue; | ||
241 | |||
281 | XmlElement elem = parent.OwnerDocument.CreateElement("", | 242 | XmlElement elem = parent.OwnerDocument.CreateElement("", |
282 | kvp.Key, ""); | 243 | kvp.Key, ""); |
283 | 244 | ||