From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * This is the fabled LibOMV update with all of the libOMV types from JHurliman * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke. --- OpenSim/Grid/AssetServer/RestService.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Grid/AssetServer/RestService.cs') 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; using System.Text; using System.Xml; using System.Xml.Serialization; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Servers; @@ -70,9 +70,9 @@ namespace OpenSim.Grid.AssetServer if (p.Length > 0) { - LLUUID assetID = null; + UUID assetID = null; - if (!LLUUID.TryParse(p[0], out assetID)) + if (!UUID.TryParse(p[0], out assetID)) { m_log.InfoFormat( "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); @@ -128,9 +128,9 @@ namespace OpenSim.Grid.AssetServer { string param = GetParam(path); - LLUUID assetId; + UUID assetId; if (param.Length > 0) - LLUUID.TryParse(param, out assetId); + UUID.TryParse(param, out assetId); // byte[] txBuffer = new byte[4096]; XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); -- cgit v1.1