aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorlbsa712007-10-19 07:46:03 +0000
committerlbsa712007-10-19 07:46:03 +0000
commit46700d3b7d5bd71d880b3cc0dd0e2d6edd701195 (patch)
tree7f2d7a8c71e288daaa2b9b6f4d6ed35b0ef54d21 /OpenSim/Region/Application
parentFix for assetserver crashing (Thank you Chi11ken) (diff)
downloadopensim-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 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs8
1 files changed, 6 insertions, 2 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;
32using System.Text; 32using System.Text;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Communications.Caches;
36using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
37using OpenSim.Framework.Interfaces; 36using OpenSim.Framework.Interfaces;
38using OpenSim.Framework.Servers; 37using 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 }