diff options
Diffstat (limited to 'OpenSim/Region/Caches/AssetCache.cs')
-rw-r--r-- | OpenSim/Region/Caches/AssetCache.cs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/Caches/AssetCache.cs b/OpenSim/Region/Caches/AssetCache.cs index 6cf921b..453edbe 100644 --- a/OpenSim/Region/Caches/AssetCache.cs +++ b/OpenSim/Region/Caches/AssetCache.cs | |||
@@ -28,13 +28,12 @@ | |||
28 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Threading; | ||
32 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Threading; | ||
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using libsecondlife.Packets; | 34 | using libsecondlife.Packets; |
35 | using OpenSim.Framework.Interfaces; | 35 | using OpenSim.Framework.Interfaces; |
36 | using OpenSim.Framework.Types; | 36 | using OpenSim.Framework.Types; |
37 | using OpenSim.Framework.Utilities; | ||
38 | 37 | ||
39 | namespace OpenSim.Region.Caches | 38 | namespace OpenSim.Region.Caches |
40 | { | 39 | { |
@@ -45,8 +44,8 @@ namespace OpenSim.Region.Caches | |||
45 | /// </summary> | 44 | /// </summary> |
46 | public class AssetCache : IAssetReceiver | 45 | public class AssetCache : IAssetReceiver |
47 | { | 46 | { |
48 | public Dictionary<libsecondlife.LLUUID, AssetInfo> Assets; | 47 | public Dictionary<LLUUID, AssetInfo> Assets; |
49 | public Dictionary<libsecondlife.LLUUID, TextureImage> Textures; | 48 | public Dictionary<LLUUID, TextureImage> Textures; |
50 | 49 | ||
51 | public List<AssetRequest> AssetRequests = new List<AssetRequest>(); //assets ready to be sent to viewers | 50 | public List<AssetRequest> AssetRequests = new List<AssetRequest>(); //assets ready to be sent to viewers |
52 | public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent | 51 | public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent |
@@ -67,8 +66,8 @@ namespace OpenSim.Region.Caches | |||
67 | Console.WriteLine("Creating Asset cache"); | 66 | Console.WriteLine("Creating Asset cache"); |
68 | _assetServer = assetServer; | 67 | _assetServer = assetServer; |
69 | _assetServer.SetReceiver(this); | 68 | _assetServer.SetReceiver(this); |
70 | Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>(); | 69 | Assets = new Dictionary<LLUUID, AssetInfo>(); |
71 | Textures = new Dictionary<libsecondlife.LLUUID, TextureImage>(); | 70 | Textures = new Dictionary<LLUUID, TextureImage>(); |
72 | this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager)); | 71 | this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager)); |
73 | this._assetCacheThread.IsBackground = true; | 72 | this._assetCacheThread.IsBackground = true; |
74 | this._assetCacheThread.Start(); | 73 | this._assetCacheThread.Start(); |
@@ -81,8 +80,8 @@ namespace OpenSim.Region.Caches | |||
81 | _assetServer = this.LoadAssetDll(assetServerDLLName); | 80 | _assetServer = this.LoadAssetDll(assetServerDLLName); |
82 | _assetServer.SetServerInfo(assetServerURL, assetServerKey); | 81 | _assetServer.SetServerInfo(assetServerURL, assetServerKey); |
83 | _assetServer.SetReceiver(this); | 82 | _assetServer.SetReceiver(this); |
84 | Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>(); | 83 | Assets = new Dictionary<LLUUID, AssetInfo>(); |
85 | Textures = new Dictionary<libsecondlife.LLUUID, TextureImage>(); | 84 | Textures = new Dictionary<LLUUID, TextureImage>(); |
86 | this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager)); | 85 | this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager)); |
87 | this._assetCacheThread.IsBackground = true; | 86 | this._assetCacheThread.IsBackground = true; |
88 | this._assetCacheThread.Start(); | 87 | this._assetCacheThread.Start(); |
@@ -216,7 +215,7 @@ namespace OpenSim.Region.Caches | |||
216 | /// Event handler, called by a TextureSender object to say that texture has been sent | 215 | /// Event handler, called by a TextureSender object to say that texture has been sent |
217 | /// </summary> | 216 | /// </summary> |
218 | /// <param name="sender"></param> | 217 | /// <param name="sender"></param> |
219 | public void TextureSent(AssetCache.TextureSender sender) | 218 | public void TextureSent(TextureSender sender) |
220 | { | 219 | { |
221 | if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID)) | 220 | if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID)) |
222 | { | 221 | { |