diff options
author | lbsa71 | 2007-10-19 07:46:03 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-19 07:46:03 +0000 |
commit | 46700d3b7d5bd71d880b3cc0dd0e2d6edd701195 (patch) | |
tree | 7f2d7a8c71e288daaa2b9b6f4d6ed35b0ef54d21 /OpenSim/Framework/Communications/Cache/AssetCache.cs | |
parent | Fix for assetserver crashing (Thank you Chi11ken) (diff) | |
download | opensim-SC-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.zip opensim-SC-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.gz opensim-SC-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.bz2 opensim-SC-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.xz |
* Total refactoring of Asset Server for massive win
* There is now a AssetServerBase
* lolcat in ur assets
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetCache.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 4ae8595..17829b2 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -91,7 +91,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
91 | { | 91 | { |
92 | System.Console.WriteLine("Creating Asset cache"); | 92 | System.Console.WriteLine("Creating Asset cache"); |
93 | _assetServer = this.LoadAssetDll(assetServerDLLName); | 93 | _assetServer = this.LoadAssetDll(assetServerDLLName); |
94 | |||
95 | |||
96 | // TODO: This actually does nothing to no IAssetServer implementor. Delete? | ||
94 | _assetServer.SetServerInfo(assetServerURL, assetServerKey); | 97 | _assetServer.SetServerInfo(assetServerURL, assetServerKey); |
98 | |||
99 | |||
95 | _assetServer.SetReceiver(this); | 100 | _assetServer.SetReceiver(this); |
96 | Assets = new Dictionary<LLUUID, AssetInfo>(); | 101 | Assets = new Dictionary<LLUUID, AssetInfo>(); |
97 | Textures = new Dictionary<LLUUID, TextureImage>(); | 102 | Textures = new Dictionary<LLUUID, TextureImage>(); |
@@ -159,7 +164,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
159 | { //texture | 164 | { //texture |
160 | TextureImage textur = new TextureImage(asset); | 165 | TextureImage textur = new TextureImage(asset); |
161 | this.Textures.Add(textur.FullID, textur); | 166 | this.Textures.Add(textur.FullID, textur); |
162 | this._assetServer.CreateAsset(asset); | 167 | this._assetServer.StoreAndCommitAsset(asset); |
163 | } | 168 | } |
164 | else | 169 | else |
165 | { | 170 | { |
@@ -173,7 +178,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
173 | { | 178 | { |
174 | AssetInfo assetInf = new AssetInfo(asset); | 179 | AssetInfo assetInf = new AssetInfo(asset); |
175 | this.Assets.Add(assetInf.FullID, assetInf); | 180 | this.Assets.Add(assetInf.FullID, assetInf); |
176 | this._assetServer.CreateAsset(asset); | 181 | this._assetServer.StoreAndCommitAsset(asset); |
177 | } | 182 | } |
178 | } | 183 | } |
179 | } | 184 | } |