aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs5
-rw-r--r--OpenSim/Framework/Communications/Cache/GridAssetClient.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/SQLAssetServer.cs7
3 files changed, 0 insertions, 16 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 74b1976..f65b88f 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -50,7 +50,6 @@ namespace OpenSim.Framework.Communications.Cache
50 protected IAssetLoader assetLoader = new AssetLoaderFileSystem(); 50 protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
51 51
52 protected abstract void StoreAsset(AssetBase asset); 52 protected abstract void StoreAsset(AssetBase asset);
53 protected abstract void CommitAssets();
54 53
55 /// <summary> 54 /// <summary>
56 /// This method must be implemented by a subclass to retrieve the asset named in the 55 /// This method must be implemented by a subclass to retrieve the asset named in the
@@ -108,8 +107,6 @@ namespace OpenSim.Framework.Communications.Cache
108 m_log.Info("[ASSET SERVER]: Setting up asset database"); 107 m_log.Info("[ASSET SERVER]: Setting up asset database");
109 108
110 assetLoader.ForEachDefaultXmlAsset(StoreAsset); 109 assetLoader.ForEachDefaultXmlAsset(StoreAsset);
111
112 CommitAssets();
113 } 110 }
114 111
115 public AssetServerBase() 112 public AssetServerBase()
@@ -167,7 +164,6 @@ namespace OpenSim.Framework.Communications.Cache
167 lock (m_syncLock) 164 lock (m_syncLock)
168 { 165 {
169 m_assetProvider.UpdateAsset(asset); 166 m_assetProvider.UpdateAsset(asset);
170 m_assetProvider.CommitAssets();
171 } 167 }
172 } 168 }
173 169
@@ -176,7 +172,6 @@ namespace OpenSim.Framework.Communications.Cache
176 lock (m_syncLock) 172 lock (m_syncLock)
177 { 173 {
178 StoreAsset(asset); 174 StoreAsset(asset);
179 CommitAssets();
180 } 175 }
181 } 176 }
182 177
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index 7787805..6caabcd 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -106,10 +106,6 @@ namespace OpenSim.Framework.Communications.Cache
106 } 106 }
107 } 107 }
108 108
109 protected override void CommitAssets()
110 {
111 }
112
113 public override void Close() 109 public override void Close()
114 { 110 {
115 throw new Exception("The method or operation is not implemented."); 111 throw new Exception("The method or operation is not implemented.");
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 334c5bd..95696ee 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -74,8 +74,6 @@ namespace OpenSim.Framework.Communications.Cache
74 public override void Close() 74 public override void Close()
75 { 75 {
76 base.Close(); 76 base.Close();
77
78 m_assetProvider.CommitAssets();
79 } 77 }
80 78
81 protected override AssetBase GetAsset(AssetRequest req) 79 protected override AssetBase GetAsset(AssetRequest req)
@@ -93,10 +91,5 @@ namespace OpenSim.Framework.Communications.Cache
93 { 91 {
94 m_assetProvider.CreateAsset(asset); 92 m_assetProvider.CreateAsset(asset);
95 } 93 }
96
97 protected override void CommitAssets()
98 {
99 m_assetProvider.CommitAssets();
100 }
101 } 94 }
102} 95}