diff options
| author | Melanie | 2012-04-20 00:17:14 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-20 00:17:14 +0100 |
| commit | 65b3e13010cae460573db0f027efa94a6a958192 (patch) | |
| tree | 71158af5b6f985b93b4e6bdb4814987cda386e81 /OpenSim/Region/CoreModules | |
| parent | Fx up estate settings (diff) | |
| parent | changed - VolumeDetect and phantom setting interaction. Script VD(true) forc... (diff) | |
| download | opensim-SC-65b3e13010cae460573db0f027efa94a6a958192.zip opensim-SC-65b3e13010cae460573db0f027efa94a6a958192.tar.gz opensim-SC-65b3e13010cae460573db0f027efa94a6a958192.tar.bz2 opensim-SC-65b3e13010cae460573db0f027efa94a6a958192.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 74701a5..f41e89e 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
| @@ -768,6 +768,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 768 | { | 768 | { |
| 769 | g.RootPart.AttachPoint = g.RootPart.Shape.State; | 769 | g.RootPart.AttachPoint = g.RootPart.Shape.State; |
| 770 | g.RootPart.AttachOffset = g.AbsolutePosition; | 770 | g.RootPart.AttachOffset = g.AbsolutePosition; |
| 771 | g.RootPart.Shape.State = 0; | ||
| 771 | } | 772 | } |
| 772 | 773 | ||
| 773 | objlist.Add(g); | 774 | objlist.Add(g); |
| @@ -800,6 +801,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 800 | SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml); | 801 | SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml); |
| 801 | g.RootPart.AttachPoint = g.RootPart.Shape.State; | 802 | g.RootPart.AttachPoint = g.RootPart.Shape.State; |
| 802 | g.RootPart.AttachOffset = g.AbsolutePosition; | 803 | g.RootPart.AttachOffset = g.AbsolutePosition; |
| 804 | g.RootPart.Shape.State = 0; | ||
| 803 | 805 | ||
| 804 | objlist.Add(g); | 806 | objlist.Add(g); |
| 805 | XmlElement el = (XmlElement)n; | 807 | XmlElement el = (XmlElement)n; |