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/Main.cs        |  6 +++---
 OpenSim/Grid/AssetServer/RestService.cs | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Grid/AssetServer')

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 6d46048..bded875 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -28,7 +28,7 @@
 using System;
 using System.IO;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using log4net.Config;
 using OpenSim.Framework;
@@ -108,7 +108,7 @@ namespace OpenSim.Grid.AssetServer
             m_httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider));
         }
 
-        public byte[] GetAssetData(LLUUID assetID, bool isTexture)
+        public byte[] GetAssetData(UUID assetID, bool isTexture)
         {
             return null;
         }
@@ -119,7 +119,7 @@ namespace OpenSim.Grid.AssetServer
                 new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect));
 
             // loader will try to load all providers (MySQL, MSSQL, etc)
-            // unless it is constrainted to the correct "Provider" entry in the addin.xml
+            // unless it is constrainted to the correct "Provider" entry in the addin.Xml
             loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider));
             loader.Load();
 
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