diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 95183ad..a950f51 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -139,25 +139,27 @@ namespace OpenSim.Framework.Communications.Cache | |||
139 | if (asset.Type == 0) | 139 | if (asset.Type == 0) |
140 | { | 140 | { |
141 | //Console.WriteLine("which is a texture"); | 141 | //Console.WriteLine("which is a texture"); |
142 | if (!this.Textures.ContainsKey(asset.FullID)) | 142 | if (!Textures.ContainsKey(asset.FullID)) |
143 | { //texture | 143 | { //texture |
144 | TextureImage textur = new TextureImage(asset); | 144 | TextureImage textur = new TextureImage(asset); |
145 | this.Textures.Add(textur.FullID, textur); | 145 | Textures.Add(textur.FullID, textur); |
146 | this._assetServer.StoreAndCommitAsset(asset); | 146 | if(!asset.Temporary) |
147 | _assetServer.StoreAndCommitAsset(asset); | ||
147 | } | 148 | } |
148 | else | 149 | else |
149 | { | 150 | { |
150 | TextureImage textur = new TextureImage(asset); | 151 | TextureImage textur = new TextureImage(asset); |
151 | this.Textures[asset.FullID] = textur; | 152 | Textures[asset.FullID] = textur; |
152 | } | 153 | } |
153 | } | 154 | } |
154 | else | 155 | else |
155 | { | 156 | { |
156 | if (!this.Assets.ContainsKey(asset.FullID)) | 157 | if (!Assets.ContainsKey(asset.FullID)) |
157 | { | 158 | { |
158 | AssetInfo assetInf = new AssetInfo(asset); | 159 | AssetInfo assetInf = new AssetInfo(asset); |
159 | this.Assets.Add(assetInf.FullID, assetInf); | 160 | Assets.Add(assetInf.FullID, assetInf); |
160 | this._assetServer.StoreAndCommitAsset(asset); | 161 | if (!asset.Temporary) |
162 | _assetServer.StoreAndCommitAsset(asset); | ||
161 | } | 163 | } |
162 | } | 164 | } |
163 | } | 165 | } |