aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Servers/Asset/AssetServerGetHandler.cs
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-09 01:00:21 +0000
committerMelanie Thielker2009-05-09 01:00:21 +0000
commitcc2b072f6e9f535dfad79e79d778177a5aa90890 (patch)
tree54ac19fef6442bd5e7b648dceb7ff3e22a7698ff /OpenSim/Servers/Asset/AssetServerGetHandler.cs
parentAdd the /data and /metadata retrieval modes to the new asset server. (diff)
downloadopensim-SC-cc2b072f6e9f535dfad79e79d778177a5aa90890.zip
opensim-SC-cc2b072f6e9f535dfad79e79d778177a5aa90890.tar.gz
opensim-SC-cc2b072f6e9f535dfad79e79d778177a5aa90890.tar.bz2
opensim-SC-cc2b072f6e9f535dfad79e79d778177a5aa90890.tar.xz
FInish basic asset server functionality on the new asset server
Diffstat (limited to '')
-rw-r--r--OpenSim/Servers/Asset/AssetServerGetHandler.cs19
1 files changed, 2 insertions, 17 deletions
diff --git a/OpenSim/Servers/Asset/AssetServerGetHandler.cs b/OpenSim/Servers/Asset/AssetServerGetHandler.cs
index 80226d4..1535fb5 100644
--- a/OpenSim/Servers/Asset/AssetServerGetHandler.cs
+++ b/OpenSim/Servers/Asset/AssetServerGetHandler.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Servers.AssetServer
78 { 78 {
79 XmlSerializer xs = 79 XmlSerializer xs =
80 new XmlSerializer(typeof(AssetMetadata)); 80 new XmlSerializer(typeof(AssetMetadata));
81 result = SerializeResult(xs, metadata); 81 result = ServerUtils.SerializeResult(xs, metadata);
82 82
83 httpResponse.StatusCode = (int)HttpStatusCode.OK; 83 httpResponse.StatusCode = (int)HttpStatusCode.OK;
84 httpResponse.ContentType = 84 httpResponse.ContentType =
@@ -92,7 +92,7 @@ namespace OpenSim.Servers.AssetServer
92 if (asset != null) 92 if (asset != null)
93 { 93 {
94 XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); 94 XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
95 result = SerializeResult(xs, asset); 95 result = ServerUtils.SerializeResult(xs, asset);
96 96
97 httpResponse.StatusCode = (int)HttpStatusCode.OK; 97 httpResponse.StatusCode = (int)HttpStatusCode.OK;
98 httpResponse.ContentType = 98 httpResponse.ContentType =
@@ -101,20 +101,5 @@ namespace OpenSim.Servers.AssetServer
101 } 101 }
102 return result; 102 return result;
103 } 103 }
104
105 private byte[] SerializeResult(XmlSerializer xs, object data)
106 {
107 MemoryStream ms = new MemoryStream();
108 XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
109 xw.Formatting = Formatting.Indented;
110 xs.Serialize(xw, data);
111 xw.Flush();
112
113 ms.Seek(0, SeekOrigin.Begin);
114 byte[] ret = ms.GetBuffer();
115 Array.Resize<byte>(ref ret, (int)ms.Length);
116
117 return ret;
118 }
119 } 104 }
120} 105}