diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetCache.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index d947228..2dceb54 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -144,14 +144,14 @@ namespace OpenSim.Framework.Communications.Caches | |||
144 | AssetBase asset = GetAsset(assetID); | 144 | AssetBase asset = GetAsset(assetID); |
145 | if (asset == null) | 145 | if (asset == null) |
146 | { | 146 | { |
147 | this._assetServer.RequestAsset(assetID, isTexture); | 147 | this._assetServer.FetchAsset(assetID, isTexture); |
148 | } | 148 | } |
149 | return asset; | 149 | return asset; |
150 | } | 150 | } |
151 | 151 | ||
152 | public void AddAsset(AssetBase asset) | 152 | public void AddAsset(AssetBase asset) |
153 | { | 153 | { |
154 | System.Console.WriteLine("adding asset " + asset.FullID.ToStringHyphenated()); | 154 | // System.Console.WriteLine("adding asset " + asset.FullID.ToStringHyphenated()); |
155 | if (asset.Type == 0) | 155 | if (asset.Type == 0) |
156 | { | 156 | { |
157 | //Console.WriteLine("which is a texture"); | 157 | //Console.WriteLine("which is a texture"); |
@@ -159,7 +159,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
159 | { //texture | 159 | { //texture |
160 | TextureImage textur = new TextureImage(asset); | 160 | TextureImage textur = new TextureImage(asset); |
161 | this.Textures.Add(textur.FullID, textur); | 161 | this.Textures.Add(textur.FullID, textur); |
162 | this._assetServer.UploadNewAsset(asset); | 162 | this._assetServer.CreateAsset(asset); |
163 | } | 163 | } |
164 | else | 164 | else |
165 | { | 165 | { |
@@ -173,7 +173,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
173 | { | 173 | { |
174 | AssetInfo assetInf = new AssetInfo(asset); | 174 | AssetInfo assetInf = new AssetInfo(asset); |
175 | this.Assets.Add(assetInf.FullID, assetInf); | 175 | this.Assets.Add(assetInf.FullID, assetInf); |
176 | this._assetServer.UploadNewAsset(asset); | 176 | this._assetServer.CreateAsset(asset); |
177 | } | 177 | } |
178 | } | 178 | } |
179 | } | 179 | } |
@@ -384,7 +384,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
384 | request.AssetRequestSource = source; | 384 | request.AssetRequestSource = source; |
385 | request.Params = transferRequest.TransferInfo.Params; | 385 | request.Params = transferRequest.TransferInfo.Params; |
386 | this.RequestedAssets.Add(requestID, request); | 386 | this.RequestedAssets.Add(requestID, request); |
387 | this._assetServer.RequestAsset(requestID, false); | 387 | this._assetServer.FetchAsset(requestID, false); |
388 | } | 388 | } |
389 | return; | 389 | return; |
390 | } | 390 | } |
@@ -561,7 +561,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
561 | request.IsTextureRequest = true; | 561 | request.IsTextureRequest = true; |
562 | request.DiscardLevel = discard; | 562 | request.DiscardLevel = discard; |
563 | this.RequestedTextures.Add(imageID, request); | 563 | this.RequestedTextures.Add(imageID, request); |
564 | this._assetServer.RequestAsset(imageID, true); | 564 | this._assetServer.FetchAsset(imageID, true); |
565 | } | 565 | } |
566 | return; | 566 | return; |
567 | } | 567 | } |