diff options
author | Melanie | 2012-04-17 23:39:41 +0200 |
---|---|---|
committer | Melanie | 2012-04-17 23:39:41 +0200 |
commit | 0fe0b2ceec2440ff284d7a494d090ce43449fd97 (patch) | |
tree | a4ccaf9e24262ec26f624d34b9011456380b4a54 /OpenSim/Region/CoreModules | |
parent | Merge branch 'ubitwork' (diff) | |
download | opensim-SC-0fe0b2ceec2440ff284d7a494d090ce43449fd97.zip opensim-SC-0fe0b2ceec2440ff284d7a494d090ce43449fd97.tar.gz opensim-SC-0fe0b2ceec2440ff284d7a494d090ce43449fd97.tar.bz2 opensim-SC-0fe0b2ceec2440ff284d7a494d090ce43449fd97.tar.xz |
Prevent objects rezzed in sim from being seen as attachments and becoming uneditable or crashers. (Foxtail of death)
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; |