OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commenting and a spelling correction

ThreadPoolClientBranch
Justin Clarke Casey 2008-02-13 01:04:27 +00:00
parent 1677bde480
commit 45638cc141
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs
View File

@ -265,13 +265,13 @@ namespace OpenSim.Framework.Communications.Cache
} }
else else
{ {
ReqestStartXfer(); RequestStartXfer();
} }
return false; return false;
} }
protected void ReqestStartXfer() protected void RequestStartXfer()
{ {
UploadComplete = false; UploadComplete = false;
XferID = Util.GetNextXferID(); XferID = Util.GetNextXferID();

16
OpenSim/Framework/Communications/Cache/AgentAssetTransactionsManager.cs
View File

@ -118,7 +118,7 @@ namespace OpenSim.Framework.Communications.Cache
uint callbackID, string description, string name, sbyte invType, uint callbackID, string description, string name, sbyte invType,
sbyte type, byte wearableType, uint nextOwnerMask) sbyte type, byte wearableType, uint nextOwnerMask)
{ {
m_log.InfoFormat( m_log.DebugFormat(
"[TRANSACTIONS MANAGER] Called HandleItemCreationFromTransaction with item {0}", name); "[TRANSACTIONS MANAGER] Called HandleItemCreationFromTransaction with item {0}", name);
AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
@ -140,7 +140,7 @@ namespace OpenSim.Framework.Communications.Cache
public void HandleItemUpdateFromTransaction(IClientAPI remoteClient, LLUUID transactionID, public void HandleItemUpdateFromTransaction(IClientAPI remoteClient, LLUUID transactionID,
InventoryItemBase item) InventoryItemBase item)
{ {
m_log.InfoFormat( m_log.DebugFormat(
"[TRANSACTIONS MANAGER] Called HandleItemUpdateFromTransaction with item {0}", "[TRANSACTIONS MANAGER] Called HandleItemUpdateFromTransaction with item {0}",
item.inventoryName); item.inventoryName);
@ -150,6 +150,15 @@ namespace OpenSim.Framework.Communications.Cache
transactions.RequestUpdateInventoryItem(remoteClient, transactionID, item); transactions.RequestUpdateInventoryItem(remoteClient, transactionID, item);
} }
/// <summary>
/// Request that a client (agent) begin an asset transfer.
/// </summary>
/// <param name="remoteClient"></param>
/// <param name="assetID"></param>
/// <param name="transaction"></param>
/// <param name="type"></param>
/// <param name="data"></param></param>
/// <param name="tempFile"></param>
public void HandleUDPUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, public void HandleUDPUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type,
byte[] data, bool storeLocal, bool tempFile) byte[] data, bool storeLocal, bool tempFile)
{ {
@ -177,7 +186,8 @@ namespace OpenSim.Framework.Communications.Cache
} }
/// <summary> /// <summary>
/// Conduct an asset transfer from the client. /// Handle asset transfer data packets received in response to the asset upload request in
/// HandleUDPUploadRequest()
/// </summary> /// </summary>
/// <param name="remoteClient"></param> /// <param name="remoteClient"></param>
/// <param name="xferID"></param> /// <param name="xferID"></param>