aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index d87091c..746b703 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2332,16 +2332,17 @@ namespace OpenSim.Region.Framework.Scenes
2332 if (e == null || attachment) // Single 2332 if (e == null || attachment) // Single
2333 { 2333 {
2334 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); 2334 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
2335/*
2335 if (!attachment) 2336 if (!attachment)
2336 { 2337 {
2337 g.RootPart.AttachPoint = g.RootPart.Shape.State; 2338 g.RootPart.AttachPoint = g.RootPart.Shape.State;
2338 g.RootPart.AttachOffset = g.AbsolutePosition; 2339 g.RootPart.AttachedPos = g.AbsolutePosition;
2339 g.RootPart.AttachRotation = g.GroupRotation; 2340 g.RootPart.AttachRotation = g.GroupRotation;
2340 if (g.RootPart.Shape.PCode != (byte)PCode.NewTree && 2341 if (g.RootPart.Shape.PCode != (byte)PCode.NewTree &&
2341 g.RootPart.Shape.PCode != (byte)PCode.Tree) 2342 g.RootPart.Shape.PCode != (byte)PCode.Tree)
2342 g.RootPart.Shape.State = 0; 2343 g.RootPart.Shape.State = 0;
2343 } 2344 }
2344 2345*/
2345 objlist.Add(g); 2346 objlist.Add(g);
2346 veclist.Add(new Vector3(0, 0, 0)); 2347 veclist.Add(new Vector3(0, 0, 0));
2347 bbox = g.GetAxisAlignedBoundingBox(out offsetHeight); 2348 bbox = g.GetAxisAlignedBoundingBox(out offsetHeight);
@@ -2360,14 +2361,14 @@ namespace OpenSim.Region.Framework.Scenes
2360 foreach (XmlNode n in groups) 2361 foreach (XmlNode n in groups)
2361 { 2362 {
2362 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml); 2363 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
2363 2364/*
2364 g.RootPart.AttachPoint = g.RootPart.Shape.State; 2365 g.RootPart.AttachPoint = g.RootPart.Shape.State;
2365 g.RootPart.AttachOffset = g.AbsolutePosition; 2366 g.RootPart.AttachedPos = g.AbsolutePosition;
2366 g.RootPart.AttachRotation = g.GroupRotation; 2367 g.RootPart.AttachRotation = g.GroupRotation;
2367 if (g.RootPart.Shape.PCode != (byte)PCode.NewTree && 2368 if (g.RootPart.Shape.PCode != (byte)PCode.NewTree &&
2368 g.RootPart.Shape.PCode != (byte)PCode.Tree) 2369 g.RootPart.Shape.PCode != (byte)PCode.Tree)
2369 g.RootPart.Shape.State = 0; 2370 g.RootPart.Shape.State = 0;
2370 2371*/
2371 objlist.Add(g); 2372 objlist.Add(g);
2372 2373
2373 XmlElement el = (XmlElement)n; 2374 XmlElement el = (XmlElement)n;