* Total refactoring of Asset Server for massive win

* There is now a AssetServerBase
* lolcat in ur assets

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;
 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);
         }
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;
 using System.Net;
 using libsecondlife;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Communications.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Types;
 using OpenSim.Region.ClientStack;
@@ -58,7 +57,6 @@ namespace SimpleApp
             m_networkServersInfo = new NetworkServersInfo( 1000, 1000 );
 
             LocalAssetServer assetServer = new LocalAssetServer();
-            assetServer.SetServerInfo(m_networkServersInfo.AssetURL, "");
 
             m_assetCache = new AssetCache(assetServer);
         }