aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer/RestService.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index f63b78b..457142f 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -32,7 +32,7 @@ using System.Reflection;
32using System.Text; 32using System.Text;
33using System.Xml; 33using System.Xml;
34using System.Xml.Serialization; 34using System.Xml.Serialization;
35using libsecondlife; 35using OpenMetaverse;
36using log4net; 36using log4net;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
@@ -70,9 +70,9 @@ namespace OpenSim.Grid.AssetServer
70 70
71 if (p.Length > 0) 71 if (p.Length > 0)
72 { 72 {
73 LLUUID assetID = null; 73 UUID assetID = null;
74 74
75 if (!LLUUID.TryParse(p[0], out assetID)) 75 if (!UUID.TryParse(p[0], out assetID))
76 { 76 {
77 m_log.InfoFormat( 77 m_log.InfoFormat(
78 "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); 78 "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
@@ -128,9 +128,9 @@ namespace OpenSim.Grid.AssetServer
128 { 128 {
129 string param = GetParam(path); 129 string param = GetParam(path);
130 130
131 LLUUID assetId; 131 UUID assetId;
132 if (param.Length > 0) 132 if (param.Length > 0)
133 LLUUID.TryParse(param, out assetId); 133 UUID.TryParse(param, out assetId);
134 // byte[] txBuffer = new byte[4096]; 134 // byte[] txBuffer = new byte[4096];
135 135
136 XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); 136 XmlSerializer xs = new XmlSerializer(typeof (AssetBase));