diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 4603902..4d439b2 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -34,7 +34,6 @@ using System.Xml; | |||
34 | using Axiom.Math; | 34 | using Axiom.Math; |
35 | using libsecondlife; | 35 | using libsecondlife; |
36 | using libsecondlife.Packets; | 36 | using libsecondlife.Packets; |
37 | using OpenSim.Framework.Interfaces; | ||
38 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
39 | using OpenSim.Region.Environment.Interfaces; | 38 | using OpenSim.Region.Environment.Interfaces; |
40 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.Physics.Manager; |
@@ -270,7 +269,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
270 | StringReader sr = new StringReader(xmlData); | 269 | StringReader sr = new StringReader(xmlData); |
271 | XmlTextReader reader = new XmlTextReader(sr); | 270 | XmlTextReader reader = new XmlTextReader(sr); |
272 | reader.Read(); | 271 | reader.Read(); |
273 | 272 | ||
274 | reader.ReadStartElement("SceneObjectGroup"); | 273 | reader.ReadStartElement("SceneObjectGroup"); |
275 | m_rootPart = SceneObjectPart.FromXml(reader); | 274 | m_rootPart = SceneObjectPart.FromXml(reader); |
276 | 275 | ||
@@ -285,14 +284,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
285 | if (reader.Name == "SceneObjectPart") | 284 | if (reader.Name == "SceneObjectPart") |
286 | { | 285 | { |
287 | SceneObjectPart Part = SceneObjectPart.FromXml(reader); | 286 | SceneObjectPart Part = SceneObjectPart.FromXml(reader); |
288 | AddPart(Part); | 287 | AddPart(Part); |
289 | } | 288 | } |
290 | break; | 289 | break; |
291 | case XmlNodeType.EndElement: | 290 | case XmlNodeType.EndElement: |
292 | reader.Read(); | 291 | reader.Read(); |
293 | break; | 292 | break; |
294 | } | 293 | } |
295 | more = !reader.EOF; | 294 | more = !reader.EOF; |
296 | } | 295 | } |
297 | reader.Close(); | 296 | reader.Close(); |
298 | sr.Close(); | 297 | sr.Close(); |
@@ -424,13 +423,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
424 | PrimitiveBaseShape pbs = dupe.RootPart.Shape; | 423 | PrimitiveBaseShape pbs = dupe.RootPart.Shape; |
425 | 424 | ||
426 | dupe.RootPart.PhysActor = m_scene.PhysScene.AddPrimShape( | 425 | dupe.RootPart.PhysActor = m_scene.PhysScene.AddPrimShape( |
427 | dupe.RootPart.Name, | 426 | dupe.RootPart.Name, |
428 | pbs, | 427 | pbs, |
429 | new PhysicsVector(dupe.RootPart.AbsolutePosition.X, dupe.RootPart.AbsolutePosition.Y, dupe.RootPart.AbsolutePosition.Z), | 428 | new PhysicsVector(dupe.RootPart.AbsolutePosition.X, dupe.RootPart.AbsolutePosition.Y, |
430 | new PhysicsVector(dupe.RootPart.Scale.X, dupe.RootPart.Scale.Y, dupe.RootPart.Scale.Z), | 429 | dupe.RootPart.AbsolutePosition.Z), |
431 | new Axiom.Math.Quaternion(dupe.RootPart.RotationOffset.W, dupe.RootPart.RotationOffset.X, | 430 | new PhysicsVector(dupe.RootPart.Scale.X, dupe.RootPart.Scale.Y, dupe.RootPart.Scale.Z), |
432 | dupe.RootPart.RotationOffset.Y, dupe.RootPart.RotationOffset.Z)); | 431 | new Quaternion(dupe.RootPart.RotationOffset.W, dupe.RootPart.RotationOffset.X, |
433 | 432 | dupe.RootPart.RotationOffset.Y, dupe.RootPart.RotationOffset.Z)); | |
434 | } | 433 | } |
435 | 434 | ||
436 | List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.Values); | 435 | List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.Values); |
@@ -951,14 +950,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
951 | } | 950 | } |
952 | if (m_rootPart.PhysActor != null) | 951 | if (m_rootPart.PhysActor != null) |
953 | { | 952 | { |
954 | this.m_scene.PhysScene.RemovePrim(m_rootPart.PhysActor); | 953 | m_scene.PhysScene.RemovePrim(m_rootPart.PhysActor); |
955 | m_rootPart.PhysActor = m_scene.PhysScene.AddPrimShape( | 954 | m_rootPart.PhysActor = m_scene.PhysScene.AddPrimShape( |
956 | m_rootPart.Name, | 955 | m_rootPart.Name, |
957 | m_rootPart.Shape, | 956 | m_rootPart.Shape, |
958 | new PhysicsVector(m_rootPart.AbsolutePosition.X, m_rootPart.AbsolutePosition.Y, m_rootPart.AbsolutePosition.Z), | 957 | new PhysicsVector(m_rootPart.AbsolutePosition.X, m_rootPart.AbsolutePosition.Y, |
959 | new PhysicsVector(m_rootPart.Scale.X, m_rootPart.Scale.Y, m_rootPart.Scale.Z), | 958 | m_rootPart.AbsolutePosition.Z), |
960 | new Axiom.Math.Quaternion(m_rootPart.RotationOffset.W, m_rootPart.RotationOffset.X, | 959 | new PhysicsVector(m_rootPart.Scale.X, m_rootPart.Scale.Y, m_rootPart.Scale.Z), |
961 | m_rootPart.RotationOffset.Y, m_rootPart.RotationOffset.Z)); | 960 | new Quaternion(m_rootPart.RotationOffset.W, m_rootPart.RotationOffset.X, |
961 | m_rootPart.RotationOffset.Y, m_rootPart.RotationOffset.Z)); | ||
962 | } | 962 | } |
963 | } | 963 | } |
964 | 964 | ||
@@ -1001,7 +1001,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1001 | AbsolutePosition = pos; | 1001 | AbsolutePosition = pos; |
1002 | ScheduleGroupForTerseUpdate(); | 1002 | ScheduleGroupForTerseUpdate(); |
1003 | 1003 | ||
1004 | m_scene.EventManager.TriggerGroupMove(this.UUID, pos); | 1004 | m_scene.EventManager.TriggerGroupMove(UUID, pos); |
1005 | } | 1005 | } |
1006 | 1006 | ||
1007 | /// <summary> | 1007 | /// <summary> |
@@ -1350,7 +1350,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1350 | 1350 | ||
1351 | public virtual void OnGrabGroup(LLVector3 offsetPos, IClientAPI remoteClient) | 1351 | public virtual void OnGrabGroup(LLVector3 offsetPos, IClientAPI remoteClient) |
1352 | { | 1352 | { |
1353 | m_scene.EventManager.TriggerGroupGrab(this.UUID, offsetPos, remoteClient.AgentId); | 1353 | m_scene.EventManager.TriggerGroupGrab(UUID, offsetPos, remoteClient.AgentId); |
1354 | } | 1354 | } |
1355 | 1355 | ||
1356 | public void DeleteGroup() | 1356 | public void DeleteGroup() |
@@ -1377,4 +1377,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
1377 | Text = text; | 1377 | Text = text; |
1378 | } | 1378 | } |
1379 | } | 1379 | } |
1380 | } | 1380 | } \ No newline at end of file |