OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a bug in SQLAssetServer that only seemed to be a problem when running under the MS .net Runtime, but was fine with mono.

afrisby
MW 2007-10-29 15:58:52 +00:00
parent 0837f6b78d
commit f6e8cbbd06
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Cache/AssetServerBase.cs
View File

@ -37,7 +37,7 @@ namespace OpenSim.Framework.Communications.Cache
public AssetServerBase() 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<ARequest>(); this._assetRequests = new BlockingQueue<ARequest>();
this._localAssetServerThread = new Thread( RunRequests ); this._localAssetServerThread = new Thread( RunRequests );

5
OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
View File

@ -42,13 +42,14 @@ namespace OpenSim.Framework.Communications.Cache
{ {
public SQLAssetServer(string pluginName) public SQLAssetServer(string pluginName)
{ {
_assetRequests = new BlockingQueue<ARequest>(); // _assetRequests = new BlockingQueue<ARequest>();
AddPlugin(pluginName); AddPlugin(pluginName);
} }
public SQLAssetServer(IAssetProvider assetProvider) public SQLAssetServer(IAssetProvider assetProvider)
{ {
m_assetProviderPlugin = assetProvider; m_assetProviderPlugin = assetProvider;
} }
public void AddPlugin(string FileName) public void AddPlugin(string FileName)
@ -92,7 +93,7 @@ namespace OpenSim.Framework.Communications.Cache
{ {
ARequest req = this._assetRequests.Dequeue(); ARequest req = this._assetRequests.Dequeue();
MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID); //MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID);
AssetBase asset = null; AssetBase asset = null;
lock (syncLock) lock (syncLock)