aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/RegionInfo.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs3
2 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index f4437e0..f05e2e6 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -1016,6 +1016,9 @@ namespace OpenSim.Framework
1016 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 1016 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
1017 "Max objects this sim will hold", "0", true); 1017 "Max objects this sim will hold", "0", true);
1018 1018
1019 configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
1020 "Max agents this sim will hold", "0", true);
1021
1019 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 1022 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
1020 "Scope ID for this region", UUID.Zero.ToString(), true); 1023 "Scope ID for this region", UUID.Zero.ToString(), true);
1021 1024
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 1992956..3e0241c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -803,6 +803,9 @@ namespace OpenSim.Region.Framework.Scenes
803 string xmlData = Utils.BytesToString(rezAsset.Data); 803 string xmlData = Utils.BytesToString(rezAsset.Data);
804 SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); 804 SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
805 805
806 group.RootPart.AttachPoint = group.RootPart.Shape.State;
807 group.RootPart.AttachOffset = group.AbsolutePosition;
808
806 group.ResetIDs(); 809 group.ResetIDs();
807 810
808 SceneObjectPart rootPart = group.GetChildPart(group.UUID); 811 SceneObjectPart rootPart = group.GetChildPart(group.UUID);