diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
6 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index 1a19585..f48710f 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||
@@ -127,7 +127,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
127 | if (estateModule.IsTerrainXfer(xferID)) | 127 | if (estateModule.IsTerrainXfer(xferID)) |
128 | return; | 128 | return; |
129 | } | 129 | } |
130 | 130 | ||
131 | m_log.ErrorFormat( | 131 | m_log.ErrorFormat( |
132 | "[AGENT ASSET TRANSACTIONS]: Could not find uploader for xfer id {0}, packet id {1}, data length {2}", | 132 | "[AGENT ASSET TRANSACTIONS]: Could not find uploader for xfer id {0}, packet id {1}, data length {2}", |
133 | xferID, packetID, data.Length); | 133 | xferID, packetID, data.Length); |
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs index f489262..89fdf09 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
43 | IAgentAssetTransactions | 43 | IAgentAssetTransactions |
44 | { | 44 | { |
45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | protected Scene m_Scene; | 47 | protected Scene m_Scene; |
48 | private bool m_dumpAssetsToFile = false; | 48 | private bool m_dumpAssetsToFile = false; |
49 | private int m_levelUpload = 0; | 49 | private int m_levelUpload = 0; |
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
53 | /// </summary> | 53 | /// </summary> |
54 | private Dictionary<UUID, AgentAssetTransactions> AgentTransactions = | 54 | private Dictionary<UUID, AgentAssetTransactions> AgentTransactions = |
55 | new Dictionary<UUID, AgentAssetTransactions>(); | 55 | new Dictionary<UUID, AgentAssetTransactions>(); |
56 | 56 | ||
57 | #region Region Module interface | 57 | #region Region Module interface |
58 | 58 | ||
59 | public void Initialise(IConfigSource source) | 59 | public void Initialise(IConfigSource source) |
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
241 | // m_log.DebugFormat( | 241 | // m_log.DebugFormat( |
242 | // "[ASSET TRANSACTION MODULE]: HandleUDPUploadRequest - assetID: {0}, transaction {1}, type {2}, storeLocal {3}, tempFile {4}, data.Length {5}", | 242 | // "[ASSET TRANSACTION MODULE]: HandleUDPUploadRequest - assetID: {0}, transaction {1}, type {2}, storeLocal {3}, tempFile {4}, data.Length {5}", |
243 | // assetID, transactionID, type, storeLocal, tempFile, data.Length); | 243 | // assetID, transactionID, type, storeLocal, tempFile, data.Length); |
244 | 244 | ||
245 | if (((AssetType)type == AssetType.Texture || | 245 | if (((AssetType)type == AssetType.Texture || |
246 | (AssetType)type == AssetType.Sound || | 246 | (AssetType)type == AssetType.Sound || |
247 | (AssetType)type == AssetType.TextureTGA || | 247 | (AssetType)type == AssetType.TextureTGA || |
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index 60a254e..d2aa177 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
41 | { | 41 | { |
42 | public class AssetXferUploader | 42 | public class AssetXferUploader |
43 | { | 43 | { |
44 | 44 | ||
45 | private List<UUID> defaultIDs = new List<UUID> { | 45 | private List<UUID> defaultIDs = new List<UUID> { |
46 | // Viewer's notion of the default texture | 46 | // Viewer's notion of the default texture |
47 | new UUID("5748decc-f629-461c-9a36-a35a221fe21f"), // others == default blank | 47 | new UUID("5748decc-f629-461c-9a36-a35a221fe21f"), // others == default blank |
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs index 4b457b1..ff71593 100644 --- a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs +++ b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Scenes; | |||
38 | namespace OpenSim.Region.CoreModules.Agent.IPBan | 38 | namespace OpenSim.Region.CoreModules.Agent.IPBan |
39 | { | 39 | { |
40 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "IPBanModule")] | 40 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "IPBanModule")] |
41 | public class IPBanModule : ISharedRegionModule | 41 | public class IPBanModule : ISharedRegionModule |
42 | { | 42 | { |
43 | #region Implementation of ISharedRegionModule | 43 | #region Implementation of ISharedRegionModule |
44 | 44 | ||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan | |||
86 | 86 | ||
87 | public void Close() | 87 | public void Close() |
88 | { | 88 | { |
89 | 89 | ||
90 | } | 90 | } |
91 | 91 | ||
92 | public string Name | 92 | public string Name |
@@ -107,9 +107,9 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan | |||
107 | /// matching domain (including "betasomewhere.com", "beta.somewhere.com", | 107 | /// matching domain (including "betasomewhere.com", "beta.somewhere.com", |
108 | /// "somewhere.com.beta") - make sure to be reasonably specific in DNS | 108 | /// "somewhere.com.beta") - make sure to be reasonably specific in DNS |
109 | /// bans. | 109 | /// bans. |
110 | /// | 110 | /// |
111 | /// IP address bans match on first characters, so, | 111 | /// IP address bans match on first characters, so, |
112 | /// "127.0.0.1" will ban only that address, | 112 | /// "127.0.0.1" will ban only that address, |
113 | /// "127.0.1" will ban "127.0.10.0" | 113 | /// "127.0.1" will ban "127.0.10.0" |
114 | /// but "127.0.1." will ban only the "127.0.1.*" network | 114 | /// but "127.0.1." will ban only the "127.0.1.*" network |
115 | /// </summary> | 115 | /// </summary> |
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 6d1f0c2..2242e42 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |||
@@ -285,7 +285,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
285 | // Cache Decoded layers | 285 | // Cache Decoded layers |
286 | SaveFileCacheForAsset(assetID, layers); | 286 | SaveFileCacheForAsset(assetID, layers); |
287 | } | 287 | } |
288 | 288 | ||
289 | // Notify Interested Parties | 289 | // Notify Interested Parties |
290 | lock (m_notifyList) | 290 | lock (m_notifyList) |
291 | { | 291 | { |
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs index 1391013..1b6401a 100644 --- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer | |||
53 | private double lastTimeTick = 0.0; | 53 | private double lastTimeTick = 0.0; |
54 | private double lastFilesExpire = 0.0; | 54 | private double lastFilesExpire = 0.0; |
55 | private bool inTimeTick = false; | 55 | private bool inTimeTick = false; |
56 | 56 | ||
57 | public struct XferRequest | 57 | public struct XferRequest |
58 | { | 58 | { |
59 | public IClientAPI remoteClient; | 59 | public IClientAPI remoteClient; |
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer | |||
68 | public int refsCount; | 68 | public int refsCount; |
69 | public double timeStampMS; | 69 | public double timeStampMS; |
70 | } | 70 | } |
71 | 71 | ||
72 | #region INonSharedRegionModule Members | 72 | #region INonSharedRegionModule Members |
73 | 73 | ||
74 | public void Initialise(IConfigSource config) | 74 | public void Initialise(IConfigSource config) |
@@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer | |||
202 | } | 202 | } |
203 | } | 203 | } |
204 | } | 204 | } |
205 | 205 | ||
206 | public void NewClient(IClientAPI client) | 206 | public void NewClient(IClientAPI client) |
207 | { | 207 | { |
208 | client.OnRequestXfer += RequestXfer; | 208 | client.OnRequestXfer += RequestXfer; |
@@ -275,7 +275,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer | |||
275 | int burstSize = remoteClient.GetAgentThrottleSilent((int)ThrottleOutPacketType.Asset) >> 11; | 275 | int burstSize = remoteClient.GetAgentThrottleSilent((int)ThrottleOutPacketType.Asset) >> 11; |
276 | if(Transfers.Count > 1) | 276 | if(Transfers.Count > 1) |
277 | burstSize /= Transfers.Count; | 277 | burstSize /= Transfers.Count; |
278 | XferDownLoad transaction = | 278 | XferDownLoad transaction = |
279 | new XferDownLoad(fileName, fileData, xferID, remoteClient, burstSize); | 279 | new XferDownLoad(fileName, fileData, xferID, remoteClient, burstSize); |
280 | 280 | ||
281 | Transfers.Add(xferID, transaction); | 281 | Transfers.Add(xferID, transaction); |
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer | |||
288 | } | 288 | } |
289 | } | 289 | } |
290 | else | 290 | else |
291 | m_log.WarnFormat("[Xfer]: {0} not found", fileName); | 291 | m_log.WarnFormat("[Xfer]: {0} not found", fileName); |
292 | } | 292 | } |
293 | } | 293 | } |
294 | 294 | ||
@@ -381,9 +381,9 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer | |||
381 | lastBytes = 1024; | 381 | lastBytes = 1024; |
382 | LastPacket--; | 382 | LastPacket--; |
383 | } | 383 | } |
384 | 384 | ||
385 | } | 385 | } |
386 | 386 | ||
387 | lastAckPacket = -1; | 387 | lastAckPacket = -1; |
388 | lastSentPacket = -1; | 388 | lastSentPacket = -1; |
389 | 389 | ||