diff options
| author | UbitUmarov | 2014-07-20 01:15:33 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-07-20 01:15:33 +0100 |
| commit | dc717303d4a361815e84312ce1c66528b58de2e5 (patch) | |
| tree | 747ed40a938ab9a24d1edceb4461ad5bb88e275f /OpenSim/Region/CoreModules | |
| parent | Fix coalesced objects not showing up as "piles" of prims (AVN only bug) (diff) | |
| download | opensim-SC_OLD-dc717303d4a361815e84312ce1c66528b58de2e5.zip opensim-SC_OLD-dc717303d4a361815e84312ce1c66528b58de2e5.tar.gz opensim-SC_OLD-dc717303d4a361815e84312ce1c66528b58de2e5.tar.bz2 opensim-SC_OLD-dc717303d4a361815e84312ce1c66528b58de2e5.tar.xz | |
replace old Attachoffset by AttachedPos. Comented out possible merge
artifacts
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 | ||