From 98fe37051a6844851245d4cd5460326873eb9759 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sat, 30 Apr 2011 14:22:46 +0200 Subject: [PATCH] Set the attachment data on scripted rez to allow toasters to work. --- OpenSim/Framework/RegionInfo.cs | 3 +++ OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index f4437e020e..f05e2e6a02 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -1016,6 +1016,9 @@ namespace OpenSim.Framework configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Max objects this sim will hold", "0", true); + configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, + "Max agents this sim will hold", "0", true); + configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, "Scope ID for this region", UUID.Zero.ToString(), true); diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 199295637e..3e0241c78c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs @@ -803,6 +803,9 @@ namespace OpenSim.Region.Framework.Scenes string xmlData = Utils.BytesToString(rezAsset.Data); SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); + group.RootPart.AttachPoint = group.RootPart.Shape.State; + group.RootPart.AttachOffset = group.AbsolutePosition; + group.ResetIDs(); SceneObjectPart rootPart = group.GetChildPart(group.UUID);