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/Framework/Scenes/SceneObjectPartInventory.cs | |
| 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/Framework/Scenes/SceneObjectPartInventory.cs')
| -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); |