aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMW2007-10-29 15:58:52 +0000
committerMW2007-10-29 15:58:52 +0000
commitf6e8cbbd068a84df8df9b668c574ad5c737c5c6f (patch)
tree227a72be69728909477347fe892818b20fb2698c /OpenSim/Framework
parentfixed one bug (where the assets we read and created from the OpenSimAssetSet.... (diff)
downloadopensim-SC-f6e8cbbd068a84df8df9b668c574ad5c737c5c6f.zip
opensim-SC-f6e8cbbd068a84df8df9b668c574ad5c737c5c6f.tar.gz
opensim-SC-f6e8cbbd068a84df8df9b668c574ad5c737c5c6f.tar.bz2
opensim-SC-f6e8cbbd068a84df8df9b668c574ad5c737c5c6f.tar.xz
Fixed a bug in SQLAssetServer that only seemed to be a problem when running under the MS .net Runtime, but was fine with mono.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/SQLAssetServer.cs5
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 74f0167..dc9c1ad 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Communications.Cache
37 37
38 public AssetServerBase() 38 public AssetServerBase()
39 { 39 {
40 OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSERVER","Starting Db4o asset storage system"); 40 OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSERVER","Starting asset storage system");
41 this._assetRequests = new BlockingQueue<ARequest>(); 41 this._assetRequests = new BlockingQueue<ARequest>();
42 42
43 this._localAssetServerThread = new Thread( RunRequests ); 43 this._localAssetServerThread = new Thread( RunRequests );
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 580e5c4..296c612 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -42,13 +42,14 @@ namespace OpenSim.Framework.Communications.Cache
42 { 42 {
43 public SQLAssetServer(string pluginName) 43 public SQLAssetServer(string pluginName)
44 { 44 {
45 _assetRequests = new BlockingQueue<ARequest>(); 45 // _assetRequests = new BlockingQueue<ARequest>();
46 AddPlugin(pluginName); 46 AddPlugin(pluginName);
47 } 47 }
48 48
49 public SQLAssetServer(IAssetProvider assetProvider) 49 public SQLAssetServer(IAssetProvider assetProvider)
50 { 50 {
51 m_assetProviderPlugin = assetProvider; 51 m_assetProviderPlugin = assetProvider;
52
52 } 53 }
53 54
54 public void AddPlugin(string FileName) 55 public void AddPlugin(string FileName)
@@ -92,7 +93,7 @@ namespace OpenSim.Framework.Communications.Cache
92 { 93 {
93 ARequest req = this._assetRequests.Dequeue(); 94 ARequest req = this._assetRequests.Dequeue();
94 95
95 MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID); 96 //MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID);
96 97
97 AssetBase asset = null; 98 AssetBase asset = null;
98 lock (syncLock) 99 lock (syncLock)