diff options
| author | Melanie Thielker | 2014-07-20 02:27:08 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-07-20 02:27:08 +0200 |
| commit | b3068355bc5e9859cc636f7f7864d58ce9f9fe7c (patch) | |
| tree | 5b55cb98ade86a844d9a8b87d41abad88393116b /OpenSim/Region/CoreModules | |
| parent | Fix duplicate attach message being sent to objects picked up from the ground (diff) | |
| parent | replace old Attachoffset by AttachedPos. Comented out possible merge (diff) | |
| download | opensim-SC-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.zip opensim-SC-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.tar.gz opensim-SC-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.tar.bz2 opensim-SC-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index a7c774c..e4f23f9 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
| @@ -390,7 +390,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 390 | // Restore attachment data after trip through the sim | 390 | // Restore attachment data after trip through the sim |
| 391 | if (objectGroup.RootPart.AttachPoint > 0) | 391 | if (objectGroup.RootPart.AttachPoint > 0) |
| 392 | { | 392 | { |
| 393 | inventoryStoredPosition = objectGroup.RootPart.AttachOffset; | 393 | inventoryStoredPosition = objectGroup.RootPart.AttachedPos; |
| 394 | inventoryStoredRotation = objectGroup.RootPart.AttachRotation; | 394 | inventoryStoredRotation = objectGroup.RootPart.AttachRotation; |
| 395 | } | 395 | } |
| 396 | 396 | ||