From 46700d3b7d5bd71d880b3cc0dd0e2d6edd701195 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 19 Oct 2007 07:46:03 +0000
Subject: * Total refactoring of Asset Server for massive win * There is now a
 AssetServerBase * lolcat in ur assets

---
 OpenSim/Region/Application/OpenSimMain.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Application/OpenSimMain.cs')

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;
 using System.Text;
 using Nini.Config;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Communications.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
@@ -286,9 +285,14 @@ namespace OpenSim
             }
             else
             {
-                assetServer = new SQLAssetServer(standaloneAssetPlugin);
+                SQLAssetServer sqlAssetServer = new SQLAssetServer(standaloneAssetPlugin);
+                sqlAssetServer.LoadDefaultAssets();
+                assetServer = sqlAssetServer;
             }
+
+            // TODO: This actually does nothing to no IAssetServer implementor. Delete?
             assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
+
             m_assetCache = new AssetCache(assetServer);
             // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
         }
-- 
cgit v1.1