aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/SQLAssetServer.cs')
-rw-r--r--OpenSim/Framework/Communications/Cache/SQLAssetServer.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index e4c278f..0a141c3 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Communications.Cache
40 40
41 public SQLAssetServer(IAssetProvider assetProvider) 41 public SQLAssetServer(IAssetProvider assetProvider)
42 { 42 {
43 m_assetProviderPlugin = assetProvider; 43 m_assetProvider = assetProvider;
44 } 44 }
45 45
46 public void AddPlugin(string FileName) 46 public void AddPlugin(string FileName)
@@ -58,12 +58,12 @@ namespace OpenSim.Framework.Communications.Cache
58 { 58 {
59 IAssetProvider plug = 59 IAssetProvider plug =
60 (IAssetProvider) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 60 (IAssetProvider) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
61 m_assetProviderPlugin = plug; 61 m_assetProvider = plug;
62 m_assetProviderPlugin.Initialise(); 62 m_assetProvider.Initialise();
63 63
64 MainLog.Instance.Verbose("AssetStorage", 64 MainLog.Instance.Verbose("AssetStorage",
65 "Added " + m_assetProviderPlugin.Name + " " + 65 "Added " + m_assetProvider.Name + " " +
66 m_assetProviderPlugin.Version); 66 m_assetProvider.Version);
67 } 67 }
68 } 68 }
69 } 69 }
@@ -74,15 +74,15 @@ namespace OpenSim.Framework.Communications.Cache
74 { 74 {
75 base.Close(); 75 base.Close();
76 76
77 m_assetProviderPlugin.CommitAssets(); 77 m_assetProvider.CommitAssets();
78 } 78 }
79 79
80 protected override AssetBase GetAsset(AssetRequest req) 80 protected override AssetBase GetAsset(AssetRequest req)
81 { 81 {
82 AssetBase asset; 82 AssetBase asset;
83 lock (syncLock) 83 lock (m_syncLock)
84 { 84 {
85 asset = m_assetProviderPlugin.FetchAsset(req.AssetID); 85 asset = m_assetProvider.FetchAsset(req.AssetID);
86 } 86 }
87 87
88 return asset; 88 return asset;
@@ -90,12 +90,12 @@ namespace OpenSim.Framework.Communications.Cache
90 90
91 protected override void StoreAsset(AssetBase asset) 91 protected override void StoreAsset(AssetBase asset)
92 { 92 {
93 m_assetProviderPlugin.CreateAsset(asset); 93 m_assetProvider.CreateAsset(asset);
94 } 94 }
95 95
96 protected override void CommitAssets() 96 protected override void CommitAssets()
97 { 97 {
98 m_assetProviderPlugin.CommitAssets(); 98 m_assetProvider.CommitAssets();
99 } 99 }
100 } 100 }
101} \ No newline at end of file 101} \ No newline at end of file