diff options
| author | Melanie | 2012-09-24 17:41:48 +0200 |
|---|---|---|
| committer | Melanie | 2012-09-24 17:41:48 +0200 |
| commit | ca9d3760abfda61451a5cc8d9f4e2030d65bcf83 (patch) | |
| tree | 794d63e920e1d98159c20bacea917b7f3bf5accf /OpenSim/Region/Framework | |
| parent | Protect the responses map with a lock. Also remove ugly "this." type of (diff) | |
| parent | If an asset upload transaction doesn't exist for a CreateInventory request, (diff) | |
| download | opensim-SC-ca9d3760abfda61451a5cc8d9f4e2030d65bcf83.zip opensim-SC-ca9d3760abfda61451a5cc8d9f4e2030d65bcf83.tar.gz opensim-SC-ca9d3760abfda61451a5cc8d9f4e2030d65bcf83.tar.bz2 opensim-SC-ca9d3760abfda61451a5cc8d9f4e2030d65bcf83.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs index 0cc8fb6..e0aad2b 100644 --- a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs +++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs | |||
| @@ -36,7 +36,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 36 | void HandleItemUpdateFromTransaction(IClientAPI remoteClient, UUID transactionID, | 36 | void HandleItemUpdateFromTransaction(IClientAPI remoteClient, UUID transactionID, |
| 37 | InventoryItemBase item); | 37 | InventoryItemBase item); |
| 38 | 38 | ||
| 39 | void HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID, | 39 | bool HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID, |
| 40 | uint callbackID, string description, string name, sbyte invType, | 40 | uint callbackID, string description, string name, sbyte invType, |
| 41 | sbyte type, byte wearableType, uint nextOwnerMask); | 41 | sbyte type, byte wearableType, uint nextOwnerMask); |
| 42 | 42 | ||