aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Agent
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs4
2 files changed, 4 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
index 8d422aa..be8aeea 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
@@ -26,8 +26,8 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection; 29//using System.Reflection;
30using log4net; 30//using log4net;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
@@ -37,8 +37,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
37{ 37{
38 public class AgentAssetTransactionsManager 38 public class AgentAssetTransactionsManager
39 { 39 {
40 private static readonly ILog m_log 40 //private static readonly ILog m_log
41 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 41 // = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 /// <summary> 43 /// <summary>
44 /// Each agent has its own singleton collection of transactions 44 /// Each agent has its own singleton collection of transactions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
index 9c0888a..5484ad5 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -55,7 +55,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
55 private IClientAPI ourClient; 55 private IClientAPI ourClient;
56 private UUID TransactionID = UUID.Zero; 56 private UUID TransactionID = UUID.Zero;
57 private sbyte type = 0; 57 private sbyte type = 0;
58 private bool UploadComplete;
59 private byte wearableType = 0; 58 private byte wearableType = 0;
60 public ulong XferID; 59 public ulong XferID;
61 60
@@ -140,15 +139,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
140 139
141 protected void RequestStartXfer() 140 protected void RequestStartXfer()
142 { 141 {
143 UploadComplete = false;
144 XferID = Util.GetNextXferID(); 142 XferID = Util.GetNextXferID();
145 ourClient.SendXferRequest(XferID, m_asset.Type, m_asset.FullID, 0, new byte[0]); 143 ourClient.SendXferRequest(XferID, m_asset.Type, m_asset.FullID, 0, new byte[0]);
146 } 144 }
147 145
148 protected void SendCompleteMessage() 146 protected void SendCompleteMessage()
149 { 147 {
150 UploadComplete = true;
151
152 ourClient.SendAssetUploadCompleteMessage(m_asset.Type, true, m_asset.FullID); 148 ourClient.SendAssetUploadCompleteMessage(m_asset.Type, true, m_asset.FullID);
153 149
154 m_finished = true; 150 m_finished = true;