aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Grid/AssetServer
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Grid/AssetServer')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs6
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs10
2 files changed, 8 insertions, 8 deletions
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 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using log4net.Config; 33using log4net.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
@@ -108,7 +108,7 @@ namespace OpenSim.Grid.AssetServer
108 m_httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider)); 108 m_httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider));
109 } 109 }
110 110
111 public byte[] GetAssetData(LLUUID assetID, bool isTexture) 111 public byte[] GetAssetData(UUID assetID, bool isTexture)
112 { 112 {
113 return null; 113 return null;
114 } 114 }
@@ -119,7 +119,7 @@ namespace OpenSim.Grid.AssetServer
119 new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect)); 119 new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect));
120 120
121 // loader will try to load all providers (MySQL, MSSQL, etc) 121 // loader will try to load all providers (MySQL, MSSQL, etc)
122 // unless it is constrainted to the correct "Provider" entry in the addin.xml 122 // unless it is constrainted to the correct "Provider" entry in the addin.Xml
123 loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider)); 123 loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider));
124 loader.Load(); 124 loader.Load();
125 125
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));