diff options
author | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
commit | 16b6738cdadc70966a93b6d025ae469738955dcb (patch) | |
tree | 7a3c0075e9ee5fd04d972bc52be38aec4d51f648 /OpenSim/Region/Environment/Modules/Agent | |
parent | DNE code cleanups (diff) | |
download | opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.zip opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2 opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.xz |
* Patch from JHurliman
* Updates to libomv r2243,
* Remove lots of unnecessary typecasts
* Improves SendWindData()
Thanks jhurliman.
* Will update OpenSim-libs in 10 minutes..
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent')
3 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs index 3b521c3..f907ecd 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs | |||
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
109 | /// <param name="transferRequest"></param> | 109 | /// <param name="transferRequest"></param> |
110 | public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest) | 110 | public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest) |
111 | { | 111 | { |
112 | UUID requestID = null; | 112 | UUID requestID = UUID.Zero; |
113 | byte source = 2; | 113 | byte source = 2; |
114 | if (transferRequest.TransferInfo.SourceType == 2) | 114 | if (transferRequest.TransferInfo.SourceType == 2) |
115 | { | 115 | { |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs index 813d271..ed714ba 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs | |||
@@ -33,6 +33,7 @@ using Nini.Config; | |||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Scenes; | 35 | using OpenSim.Region.Environment.Scenes; |
36 | using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Environment.Interfaces.ITextureSender>; | ||
36 | 37 | ||
37 | namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | 38 | namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload |
38 | { | 39 | { |
@@ -44,8 +45,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
44 | /// <summary> | 45 | /// <summary> |
45 | /// There is one queue for all textures waiting to be sent, regardless of the requesting user. | 46 | /// There is one queue for all textures waiting to be sent, regardless of the requesting user. |
46 | /// </summary> | 47 | /// </summary> |
47 | private readonly BlockingQueue<ITextureSender> m_queueSenders | 48 | private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_queueSenders |
48 | = new BlockingQueue<ITextureSender>(); | 49 | = new OpenSim.Framework.BlockingQueue<ITextureSender>(); |
49 | 50 | ||
50 | /// <summary> | 51 | /// <summary> |
51 | /// Each user has their own texture download service. | 52 | /// Each user has their own texture download service. |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs index c38bc62..93f4d1b 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | |||
@@ -35,6 +35,7 @@ using OpenSim.Framework.Statistics; | |||
35 | using OpenSim.Region.Environment.Interfaces; | 35 | using OpenSim.Region.Environment.Interfaces; |
36 | using OpenSim.Region.Environment.Scenes; | 36 | using OpenSim.Region.Environment.Scenes; |
37 | 37 | ||
38 | |||
38 | namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | 39 | namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload |
39 | { | 40 | { |
40 | /// <summary> | 41 | /// <summary> |
@@ -75,7 +76,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
75 | /// Texture Senders are placed in this queue once they have received their texture from the asset | 76 | /// Texture Senders are placed in this queue once they have received their texture from the asset |
76 | /// cache. Another module actually invokes the send. | 77 | /// cache. Another module actually invokes the send. |
77 | /// </summary> | 78 | /// </summary> |
78 | private readonly BlockingQueue<ITextureSender> m_sharedSendersQueue; | 79 | private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_sharedSendersQueue; |
79 | 80 | ||
80 | /// <summary> | 81 | /// <summary> |
81 | /// Holds texture senders before they have received the appropriate texture from the asset cache. | 82 | /// Holds texture senders before they have received the appropriate texture from the asset cache. |
@@ -91,7 +92,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
91 | = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); | 92 | = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); |
92 | 93 | ||
93 | public UserTextureDownloadService( | 94 | public UserTextureDownloadService( |
94 | IClientAPI client, Scene scene, BlockingQueue<ITextureSender> sharedQueue) | 95 | IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue<ITextureSender> sharedQueue) |
95 | { | 96 | { |
96 | m_client = client; | 97 | m_client = client; |
97 | m_scene = scene; | 98 | m_scene = scene; |