OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set the attachment data on scripted rez to allow toasters to work.

avinationmerge
Melanie 2011-04-30 14:22:46 +02:00
parent 4ed54dcc01
commit 98fe37051a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/RegionInfo.cs
View File

@ -1016,6 +1016,9 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
"Max objects this sim will hold", "0", true); "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, configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
"Scope ID for this region", UUID.Zero.ToString(), true); "Scope ID for this region", UUID.Zero.ToString(), true);

3
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -803,6 +803,9 @@ namespace OpenSim.Region.Framework.Scenes
string xmlData = Utils.BytesToString(rezAsset.Data); string xmlData = Utils.BytesToString(rezAsset.Data);
SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
group.RootPart.AttachPoint = group.RootPart.Shape.State;
group.RootPart.AttachOffset = group.AbsolutePosition;
group.ResetIDs(); group.ResetIDs();
SceneObjectPart rootPart = group.GetChildPart(group.UUID); SceneObjectPart rootPart = group.GetChildPart(group.UUID);