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 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Grid/AssetServer/Main.cs') 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 (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(); -- cgit v1.1