aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer/Main.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/AssetServer/Main.cs')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 7a7c843..3061e5c 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -30,13 +30,14 @@ using System;
30using System.IO; 30using System.IO;
31 31
32using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Communications.Cache;
33using OpenSim.Framework.Configuration; 34using OpenSim.Framework.Configuration;
34using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
35using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
36using OpenSim.Framework.Configuration; 37using OpenSim.Framework.Configuration;
37using OpenSim.Framework.Interfaces; 38using OpenSim.Framework.Interfaces;
38using OpenSim.Framework.Utilities; 39using OpenSim.Framework.Utilities;
39using OpenSim.Framework.Communications.Caches; 40
40/* 41/*
41using System.Text; 42using System.Text;
42using Db4objects.Db4o; 43using Db4objects.Db4o;
@@ -114,7 +115,10 @@ namespace OpenSim.Grid.AssetServer
114 { 115 {
115 try 116 try
116 { 117 {
117 m_assetServer = new SQLAssetServer(config.DatabaseProvider); 118 SQLAssetServer assetServer = new SQLAssetServer(config.DatabaseProvider );
119 assetServer.LoadDefaultAssets();
120
121 m_assetServer = assetServer;
118 } 122 }
119 catch (Exception e) 123 catch (Exception e)
120 { 124 {