diff options
| author | UbitUmarov | 2014-07-19 20:27:05 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2014-07-19 22:18:12 +0200 |
| commit | 95b89dd450cb55393a882272da06f404aed04ba8 (patch) | |
| tree | 9d932ee77ab8a79cee0acbd1e366f2e1e20aa41a | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| download | opensim-SC-95b89dd450cb55393a882272da06f404aed04ba8.zip opensim-SC-95b89dd450cb55393a882272da06f404aed04ba8.tar.gz opensim-SC-95b89dd450cb55393a882272da06f404aed04ba8.tar.bz2 opensim-SC-95b89dd450cb55393a882272da06f404aed04ba8.tar.xz | |
fix attachments
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index cba75f1..d87091c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2332,13 +2332,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2332 | if (e == null || attachment) // Single | 2332 | if (e == null || attachment) // Single |
| 2333 | { | 2333 | { |
| 2334 | SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); | 2334 | SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); |
| 2335 | 2335 | if (!attachment) | |
| 2336 | g.RootPart.AttachPoint = g.RootPart.Shape.State; | 2336 | { |
| 2337 | g.RootPart.AttachOffset = g.AbsolutePosition; | 2337 | g.RootPart.AttachPoint = g.RootPart.Shape.State; |
| 2338 | g.RootPart.AttachRotation = g.GroupRotation; | 2338 | g.RootPart.AttachOffset = g.AbsolutePosition; |
| 2339 | if (g.RootPart.Shape.PCode != (byte)PCode.NewTree && | 2339 | g.RootPart.AttachRotation = g.GroupRotation; |
| 2340 | g.RootPart.Shape.PCode != (byte)PCode.Tree) | 2340 | if (g.RootPart.Shape.PCode != (byte)PCode.NewTree && |
| 2341 | g.RootPart.Shape.State = 0; | 2341 | g.RootPart.Shape.PCode != (byte)PCode.Tree) |
| 2342 | g.RootPart.Shape.State = 0; | ||
| 2343 | } | ||
| 2342 | 2344 | ||
| 2343 | objlist.Add(g); | 2345 | objlist.Add(g); |
| 2344 | veclist.Add(new Vector3(0, 0, 0)); | 2346 | veclist.Add(new Vector3(0, 0, 0)); |