aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer/Main.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/AssetServer/Main.cs')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs6
1 files changed, 3 insertions, 3 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