From f6e8cbbd068a84df8df9b668c574ad5c737c5c6f Mon Sep 17 00:00:00 2001 From: MW Date: Mon, 29 Oct 2007 15:58:52 +0000 Subject: [PATCH] Fixed a bug in SQLAssetServer that only seemed to be a problem when running under the MS .net Runtime, but was fine with mono. --- OpenSim/Framework/Communications/Cache/AssetServerBase.cs | 2 +- OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index 74f0167dc9..dc9c1adc24 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs @@ -37,7 +37,7 @@ namespace OpenSim.Framework.Communications.Cache public AssetServerBase() { - OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSERVER","Starting Db4o asset storage system"); + OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSERVER","Starting asset storage system"); this._assetRequests = new BlockingQueue(); this._localAssetServerThread = new Thread( RunRequests ); diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs index 580e5c4ad0..296c612453 100644 --- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs @@ -42,13 +42,14 @@ namespace OpenSim.Framework.Communications.Cache { public SQLAssetServer(string pluginName) { - _assetRequests = new BlockingQueue(); + // _assetRequests = new BlockingQueue(); AddPlugin(pluginName); } public SQLAssetServer(IAssetProvider assetProvider) { m_assetProviderPlugin = assetProvider; + } public void AddPlugin(string FileName) @@ -92,7 +93,7 @@ namespace OpenSim.Framework.Communications.Cache { ARequest req = this._assetRequests.Dequeue(); - MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID); + //MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID); AssetBase asset = null; lock (syncLock)