diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Grid/AssetServer/Main.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-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/Main.cs')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 6 |
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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | using log4net; | 32 | using log4net; |
33 | using log4net.Config; | 33 | using log4net.Config; |
34 | using OpenSim.Framework; | 34 | using 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 | ||