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/Grid/AssetServer | |
parent | Fix for assetserver crashing (Thank you Chi11ken) (diff) | |
download | opensim-SC-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.zip opensim-SC-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.gz opensim-SC-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.bz2 opensim-SC-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.xz |
* Total refactoring of Asset Server for massive win
* There is now a AssetServerBase
* lolcat in ur assets
Diffstat (limited to 'OpenSim/Grid/AssetServer')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 8 |
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; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | 31 | ||
32 | using libsecondlife; | 32 | using libsecondlife; |
33 | using OpenSim.Framework.Communications.Cache; | ||
33 | using OpenSim.Framework.Configuration; | 34 | using OpenSim.Framework.Configuration; |
34 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
35 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
36 | using OpenSim.Framework.Configuration; | 37 | using OpenSim.Framework.Configuration; |
37 | using OpenSim.Framework.Interfaces; | 38 | using OpenSim.Framework.Interfaces; |
38 | using OpenSim.Framework.Utilities; | 39 | using OpenSim.Framework.Utilities; |
39 | using OpenSim.Framework.Communications.Caches; | 40 | |
40 | /* | 41 | /* |
41 | using System.Text; | 42 | using System.Text; |
42 | using Db4objects.Db4o; | 43 | using 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 | { |