diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/SQLAssetServer.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs index 0953e19..b4f29db 100644 --- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | |||
@@ -26,14 +26,8 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Threading; | ||
31 | using System.Reflection; | 29 | using System.Reflection; |
32 | using libsecondlife; | ||
33 | using Nini.Config; | ||
34 | using OpenSim.Framework.Console; | 30 | using OpenSim.Framework.Console; |
35 | using OpenSim.Framework.Interfaces; | ||
36 | using OpenSim.Framework; | ||
37 | 31 | ||
38 | namespace OpenSim.Framework.Communications.Cache | 32 | namespace OpenSim.Framework.Communications.Cache |
39 | { | 33 | { |
@@ -62,11 +56,14 @@ namespace OpenSim.Framework.Communications.Cache | |||
62 | 56 | ||
63 | if (typeInterface != null) | 57 | if (typeInterface != null) |
64 | { | 58 | { |
65 | IAssetProvider plug = (IAssetProvider)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 59 | IAssetProvider plug = |
60 | (IAssetProvider) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
66 | m_assetProviderPlugin = plug; | 61 | m_assetProviderPlugin = plug; |
67 | m_assetProviderPlugin.Initialise(); | 62 | m_assetProviderPlugin.Initialise(); |
68 | 63 | ||
69 | MainLog.Instance.Verbose("AssetStorage","Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version); | 64 | MainLog.Instance.Verbose("AssetStorage", |
65 | "Added " + m_assetProviderPlugin.Name + " " + | ||
66 | m_assetProviderPlugin.Version); | ||
70 | } | 67 | } |
71 | 68 | ||
72 | typeInterface = null; | 69 | typeInterface = null; |
@@ -84,13 +81,13 @@ namespace OpenSim.Framework.Communications.Cache | |||
84 | m_assetProviderPlugin.CommitAssets(); | 81 | m_assetProviderPlugin.CommitAssets(); |
85 | } | 82 | } |
86 | 83 | ||
87 | override protected void RunRequests() | 84 | protected override void RunRequests() |
88 | { | 85 | { |
89 | while (true) | 86 | while (true) |
90 | { | 87 | { |
91 | ARequest req = this._assetRequests.Dequeue(); | 88 | ARequest req = _assetRequests.Dequeue(); |
92 | 89 | ||
93 | //MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID); | 90 | //MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID); |
94 | 91 | ||
95 | AssetBase asset = null; | 92 | AssetBase asset = null; |
96 | lock (syncLock) | 93 | lock (syncLock) |
@@ -105,9 +102,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
105 | { | 102 | { |
106 | _receiver.AssetNotFound(req.AssetID); | 103 | _receiver.AssetNotFound(req.AssetID); |
107 | } | 104 | } |
108 | |||
109 | } | 105 | } |
110 | |||
111 | } | 106 | } |
112 | 107 | ||
113 | protected override void StoreAsset(AssetBase asset) | 108 | protected override void StoreAsset(AssetBase asset) |