aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/AgentAssetTransactionsManager.cs16
2 files changed, 15 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs
index 92390b5..d40c354 100644
--- a/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs
@@ -265,13 +265,13 @@ namespace OpenSim.Framework.Communications.Cache
265 } 265 }
266 else 266 else
267 { 267 {
268 ReqestStartXfer(); 268 RequestStartXfer();
269 } 269 }
270 270
271 return false; 271 return false;
272 } 272 }
273 273
274 protected void ReqestStartXfer() 274 protected void RequestStartXfer()
275 { 275 {
276 UploadComplete = false; 276 UploadComplete = false;
277 XferID = Util.GetNextXferID(); 277 XferID = Util.GetNextXferID();
diff --git a/OpenSim/Framework/Communications/Cache/AgentAssetTransactionsManager.cs b/OpenSim/Framework/Communications/Cache/AgentAssetTransactionsManager.cs
index 82fe4c0..bb523f4 100644
--- a/OpenSim/Framework/Communications/Cache/AgentAssetTransactionsManager.cs
+++ b/OpenSim/Framework/Communications/Cache/AgentAssetTransactionsManager.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.Communications.Cache
118 uint callbackID, string description, string name, sbyte invType, 118 uint callbackID, string description, string name, sbyte invType,
119 sbyte type, byte wearableType, uint nextOwnerMask) 119 sbyte type, byte wearableType, uint nextOwnerMask)
120 { 120 {
121 m_log.InfoFormat( 121 m_log.DebugFormat(
122 "[TRANSACTIONS MANAGER] Called HandleItemCreationFromTransaction with item {0}", name); 122 "[TRANSACTIONS MANAGER] Called HandleItemCreationFromTransaction with item {0}", name);
123 123
124 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); 124 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
@@ -140,7 +140,7 @@ namespace OpenSim.Framework.Communications.Cache
140 public void HandleItemUpdateFromTransaction(IClientAPI remoteClient, LLUUID transactionID, 140 public void HandleItemUpdateFromTransaction(IClientAPI remoteClient, LLUUID transactionID,
141 InventoryItemBase item) 141 InventoryItemBase item)
142 { 142 {
143 m_log.InfoFormat( 143 m_log.DebugFormat(
144 "[TRANSACTIONS MANAGER] Called HandleItemUpdateFromTransaction with item {0}", 144 "[TRANSACTIONS MANAGER] Called HandleItemUpdateFromTransaction with item {0}",
145 item.inventoryName); 145 item.inventoryName);
146 146
@@ -150,6 +150,15 @@ namespace OpenSim.Framework.Communications.Cache
150 transactions.RequestUpdateInventoryItem(remoteClient, transactionID, item); 150 transactions.RequestUpdateInventoryItem(remoteClient, transactionID, item);
151 } 151 }
152 152
153 /// <summary>
154 /// Request that a client (agent) begin an asset transfer.
155 /// </summary>
156 /// <param name="remoteClient"></param>
157 /// <param name="assetID"></param>
158 /// <param name="transaction"></param>
159 /// <param name="type"></param>
160 /// <param name="data"></param></param>
161 /// <param name="tempFile"></param>
153 public void HandleUDPUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, 162 public void HandleUDPUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type,
154 byte[] data, bool storeLocal, bool tempFile) 163 byte[] data, bool storeLocal, bool tempFile)
155 { 164 {
@@ -177,7 +186,8 @@ namespace OpenSim.Framework.Communications.Cache
177 } 186 }
178 187
179 /// <summary> 188 /// <summary>
180 /// Conduct an asset transfer from the client. 189 /// Handle asset transfer data packets received in response to the asset upload request in
190 /// HandleUDPUploadRequest()
181 /// </summary> 191 /// </summary>
182 /// <param name="remoteClient"></param> 192 /// <param name="remoteClient"></param>
183 /// <param name="xferID"></param> 193 /// <param name="xferID"></param>