diff options
Diffstat (limited to '')
3 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs index 8f81f3d..813d271 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Threading; | 30 | using System.Threading; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
@@ -50,8 +50,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
50 | /// <summary> | 50 | /// <summary> |
51 | /// Each user has their own texture download service. | 51 | /// Each user has their own texture download service. |
52 | /// </summary> | 52 | /// </summary> |
53 | private readonly Dictionary<LLUUID, UserTextureDownloadService> m_userTextureServices = | 53 | private readonly Dictionary<UUID, UserTextureDownloadService> m_userTextureServices = |
54 | new Dictionary<LLUUID, UserTextureDownloadService>(); | 54 | new Dictionary<UUID, UserTextureDownloadService>(); |
55 | 55 | ||
56 | private Scene m_scene; | 56 | private Scene m_scene; |
57 | private List<Scene> m_scenes = new List<Scene>(); | 57 | private List<Scene> m_scenes = new List<Scene>(); |
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
109 | /// Cleanup the texture service related objects for the removed presence. | 109 | /// Cleanup the texture service related objects for the removed presence. |
110 | /// </summary> | 110 | /// </summary> |
111 | /// <param name="agentId"> </param> | 111 | /// <param name="agentId"> </param> |
112 | private void EventManager_OnRemovePresence(LLUUID agentId) | 112 | private void EventManager_OnRemovePresence(UUID agentId) |
113 | { | 113 | { |
114 | UserTextureDownloadService textureService; | 114 | UserTextureDownloadService textureService; |
115 | 115 | ||
@@ -216,4 +216,4 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
216 | m_scene.AddPendingDownloads(-1); | 216 | m_scene.AddPendingDownloads(-1); |
217 | } | 217 | } |
218 | } | 218 | } |
219 | } \ No newline at end of file | 219 | } |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index c5af174..f6d8543 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | |||
@@ -25,8 +25,8 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using libsecondlife; | 28 | using OpenMetaverse; |
29 | using libsecondlife.Packets; | 29 | using OpenMetaverse.Packets; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.Environment.Interfaces; | 31 | using OpenSim.Region.Environment.Interfaces; |
32 | 32 | ||
@@ -46,11 +46,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
46 | // See ITextureSender | 46 | // See ITextureSender |
47 | 47 | ||
48 | // private bool m_sending = false; | 48 | // private bool m_sending = false; |
49 | private LLUUID m_textureId; | 49 | private UUID m_textureId; |
50 | 50 | ||
51 | // See ITextureSender | 51 | // See ITextureSender |
52 | 52 | ||
53 | public TextureNotFoundSender(IClientAPI client, LLUUID textureID) | 53 | public TextureNotFoundSender(IClientAPI client, UUID textureID) |
54 | { | 54 | { |
55 | // // m_client = client; | 55 | // // m_client = client; |
56 | m_textureId = textureID; | 56 | m_textureId = textureID; |
@@ -101,4 +101,4 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
101 | 101 | ||
102 | #endregion | 102 | #endregion |
103 | } | 103 | } |
104 | } \ No newline at end of file | 104 | } |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs index e6ee75f..c38bc62 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using libsecondlife; | 30 | using OpenMetaverse; |
31 | using log4net; | 31 | using log4net; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Communications.Limit; | 33 | using OpenSim.Framework.Communications.Limit; |
@@ -65,8 +65,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
65 | /// <summary> | 65 | /// <summary> |
66 | /// XXX Also going to limit requests for found textures. | 66 | /// XXX Also going to limit requests for found textures. |
67 | /// </summary> | 67 | /// </summary> |
68 | private readonly IRequestLimitStrategy<LLUUID> foundTextureLimitStrategy | 68 | private readonly IRequestLimitStrategy<UUID> foundTextureLimitStrategy |
69 | = new RepeatLimitStrategy<LLUUID>(MAX_ALLOWED_TEXTURE_REQUESTS); | 69 | = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); |
70 | 70 | ||
71 | private readonly IClientAPI m_client; | 71 | private readonly IClientAPI m_client; |
72 | private readonly Scene m_scene; | 72 | private readonly Scene m_scene; |
@@ -80,15 +80,15 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
80 | /// <summary> | 80 | /// <summary> |
81 | /// Holds texture senders before they have received the appropriate texture from the asset cache. | 81 | /// Holds texture senders before they have received the appropriate texture from the asset cache. |
82 | /// </summary> | 82 | /// </summary> |
83 | private readonly Dictionary<LLUUID, TextureSender.TextureSender> m_textureSenders = new Dictionary<LLUUID, TextureSender.TextureSender>(); | 83 | private readonly Dictionary<UUID, TextureSender.TextureSender> m_textureSenders = new Dictionary<UUID, TextureSender.TextureSender>(); |
84 | 84 | ||
85 | /// <summary> | 85 | /// <summary> |
86 | /// We're going to limit requests for the same missing texture. | 86 | /// We're going to limit requests for the same missing texture. |
87 | /// XXX This is really a temporary solution to deal with the situation where a client continually requests | 87 | /// XXX This is really a temporary solution to deal with the situation where a client continually requests |
88 | /// the same missing textures | 88 | /// the same missing textures |
89 | /// </summary> | 89 | /// </summary> |
90 | private readonly IRequestLimitStrategy<LLUUID> missingTextureLimitStrategy | 90 | private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy |
91 | = new RepeatLimitStrategy<LLUUID>(MAX_ALLOWED_TEXTURE_REQUESTS); | 91 | = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); |
92 | 92 | ||
93 | public UserTextureDownloadService( | 93 | public UserTextureDownloadService( |
94 | IClientAPI client, Scene scene, BlockingQueue<ITextureSender> sharedQueue) | 94 | IClientAPI client, Scene scene, BlockingQueue<ITextureSender> sharedQueue) |
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
172 | /// </summary> | 172 | /// </summary> |
173 | /// <param name="textureID"></param> | 173 | /// <param name="textureID"></param> |
174 | /// <param name="texture"></param> | 174 | /// <param name="texture"></param> |
175 | public void TextureCallback(LLUUID textureID, AssetBase texture) | 175 | public void TextureCallback(UUID textureID, AssetBase texture) |
176 | { | 176 | { |
177 | //m_log.DebugFormat("[USER TEXTURE DOWNLOAD SERVICE]: Calling TextureCallback with {0}, texture == null is {1}", textureID, (texture == null ? true : false)); | 177 | //m_log.DebugFormat("[USER TEXTURE DOWNLOAD SERVICE]: Calling TextureCallback with {0}, texture == null is {1}", textureID, (texture == null ? true : false)); |
178 | 178 | ||