diff options
| author | UbitUmarov | 2018-11-17 17:05:28 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-11-17 17:05:28 +0000 |
| commit | efd6fb05a9f3805ce19dc432b6d084497cd45573 (patch) | |
| tree | 4dd255f52392a2e9c3fd4830559e28750129ef78 /OpenSim/Region/CoreModules/Avatar/Inventory | |
| parent | code aesthetics (diff) | |
| download | opensim-SC-efd6fb05a9f3805ce19dc432b6d084497cd45573.zip opensim-SC-efd6fb05a9f3805ce19dc432b6d084497cd45573.tar.gz opensim-SC-efd6fb05a9f3805ce19dc432b6d084497cd45573.tar.bz2 opensim-SC-efd6fb05a9f3805ce19dc432b6d084497cd45573.tar.xz | |
code aesthetics
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 5d7f25c..abeed5b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
| @@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
| 396 | { | 396 | { |
| 397 | folder = invService.GetFolder(client.AgentId, inventoryID); | 397 | folder = invService.GetFolder(client.AgentId, inventoryID); |
| 398 | 398 | ||
| 399 | if (folder != null & trashFolder != null) | 399 | if (folder != null && trashFolder != null) |
| 400 | { | 400 | { |
| 401 | previousParentFolderID = folder.ParentID; | 401 | previousParentFolderID = folder.ParentID; |
| 402 | folder.ParentID = trashFolder.ID; | 402 | folder.ParentID = trashFolder.ID; |
| @@ -405,7 +405,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
| 405 | } | 405 | } |
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | if ((null == item && null == folder) | null == trashFolder) | 408 | if ((null == item && null == folder) || null == trashFolder) |
| 409 | { | 409 | { |
| 410 | string reason = String.Empty; | 410 | string reason = String.Empty; |
| 411 | 411 | ||