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/Framework/Scenes/SceneObjectPartInventory.cs | |
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 '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 8893cc0..257e01e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -904,11 +904,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
904 | for (int i = 0; i < objlist.Count; i++) | 904 | for (int i = 0; i < objlist.Count; i++) |
905 | { | 905 | { |
906 | SceneObjectGroup group = objlist[i]; | 906 | SceneObjectGroup group = objlist[i]; |
907 | 907 | /* | |
908 | group.RootPart.AttachPoint = group.RootPart.Shape.State; | 908 | group.RootPart.AttachPoint = group.RootPart.Shape.State; |
909 | group.RootPart.AttachOffset = group.AbsolutePosition; | 909 | group.RootPart.AttachedPos = group.AbsolutePosition; |
910 | group.RootPart.AttachRotation = group.GroupRotation; | 910 | group.RootPart.AttachRotation = group.GroupRotation; |
911 | 911 | */ | |
912 | group.ResetIDs(); | 912 | group.ResetIDs(); |
913 | 913 | ||
914 | SceneObjectPart rootPart = group.GetPart(group.UUID); | 914 | SceneObjectPart rootPart = group.GetPart(group.UUID); |