diff options
author | Justin Clarke Casey | 2008-07-07 19:18:44 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-07 19:18:44 +0000 |
commit | 1813946937267edde79cb471c357f6cd85efd8ec (patch) | |
tree | cd9854a7d72409a094ac23fed9677cf438568944 /OpenSim/Framework | |
parent | * Start scripts loaded from an archive (diff) | |
download | opensim-SC-1813946937267edde79cb471c357f6cd85efd8ec.zip opensim-SC-1813946937267edde79cb471c357f6cd85efd8ec.tar.gz opensim-SC-1813946937267edde79cb471c357f6cd85efd8ec.tar.bz2 opensim-SC-1813946937267edde79cb471c357f6cd85efd8ec.tar.xz |
* remove unused CommitAssets() hook for now
Diffstat (limited to 'OpenSim/Framework')
4 files changed, 0 insertions, 17 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 | } |
diff --git a/OpenSim/Framework/IAssetProvider.cs b/OpenSim/Framework/IAssetProvider.cs index dcb79ea..a9d0e33 100644 --- a/OpenSim/Framework/IAssetProvider.cs +++ b/OpenSim/Framework/IAssetProvider.cs | |||
@@ -35,7 +35,6 @@ namespace OpenSim.Framework | |||
35 | void CreateAsset(AssetBase asset); | 35 | void CreateAsset(AssetBase asset); |
36 | void UpdateAsset(AssetBase asset); | 36 | void UpdateAsset(AssetBase asset); |
37 | bool ExistsAsset(LLUUID uuid); | 37 | bool ExistsAsset(LLUUID uuid); |
38 | void CommitAssets(); // force a sync to the database | ||
39 | void Initialise(string connect); | 38 | void Initialise(string connect); |
40 | } | 39 | } |
41 | } | 40 | } |