ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

* This is the fabled LibOMV update with all of the libOMV types from JHurliman

Browse Source 
* 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.
This commit is contained in:
Teravus Ovares
2008-09-06 07:52:41 +00:00
parent cbec2bf22b
commit 7d89e12293
388 changed files with 6811 additions and 7138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Grid/AssetServer/Main.cs
View File

@@ -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();

10
OpenSim/Grid/AssetServer/RestService.cs
View File

@@ -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));