diff options
author | lbsa71 | 2007-10-19 07:46:03 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-19 07:46:03 +0000 |
commit | 46700d3b7d5bd71d880b3cc0dd0e2d6edd701195 (patch) | |
tree | 7f2d7a8c71e288daaa2b9b6f4d6ed35b0ef54d21 /OpenSim/Region | |
parent | Fix for assetserver crashing (Thank you Chi11ken) (diff) | |
download | opensim-SC_OLD-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.zip opensim-SC_OLD-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.gz opensim-SC_OLD-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.bz2 opensim-SC_OLD-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.xz |
* Total refactoring of Asset Server for massive win
* There is now a AssetServerBase
* lolcat in ur assets
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index ca72d62..4753145 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -32,7 +32,6 @@ using System.IO; | |||
32 | using System.Text; | 32 | using System.Text; |
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenSim.Framework.Communications.Cache; | 34 | using OpenSim.Framework.Communications.Cache; |
35 | using OpenSim.Framework.Communications.Caches; | ||
36 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Interfaces; | 36 | using OpenSim.Framework.Interfaces; |
38 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
@@ -286,9 +285,14 @@ namespace OpenSim | |||
286 | } | 285 | } |
287 | else | 286 | else |
288 | { | 287 | { |
289 | assetServer = new SQLAssetServer(standaloneAssetPlugin); | 288 | SQLAssetServer sqlAssetServer = new SQLAssetServer(standaloneAssetPlugin); |
289 | sqlAssetServer.LoadDefaultAssets(); | ||
290 | assetServer = sqlAssetServer; | ||
290 | } | 291 | } |
292 | |||
293 | // TODO: This actually does nothing to no IAssetServer implementor. Delete? | ||
291 | assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | 294 | assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); |
295 | |||
292 | m_assetCache = new AssetCache(assetServer); | 296 | m_assetCache = new AssetCache(assetServer); |
293 | // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | 297 | // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); |
294 | } | 298 | } |
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index 47b9ddd..7967867 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
@@ -32,7 +32,6 @@ using System.IO; | |||
32 | using System.Net; | 32 | using System.Net; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using OpenSim.Framework.Communications.Cache; | 34 | using OpenSim.Framework.Communications.Cache; |
35 | using OpenSim.Framework.Communications.Caches; | ||
36 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Types; | 36 | using OpenSim.Framework.Types; |
38 | using OpenSim.Region.ClientStack; | 37 | using OpenSim.Region.ClientStack; |
@@ -58,7 +57,6 @@ namespace SimpleApp | |||
58 | m_networkServersInfo = new NetworkServersInfo( 1000, 1000 ); | 57 | m_networkServersInfo = new NetworkServersInfo( 1000, 1000 ); |
59 | 58 | ||
60 | LocalAssetServer assetServer = new LocalAssetServer(); | 59 | LocalAssetServer assetServer = new LocalAssetServer(); |
61 | assetServer.SetServerInfo(m_networkServersInfo.AssetURL, ""); | ||
62 | 60 | ||
63 | m_assetCache = new AssetCache(assetServer); | 61 | m_assetCache = new AssetCache(assetServer); |
64 | } | 62 | } |