aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs24
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index fb9c29c..db4ab52 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1107,20 +1107,22 @@ namespace OpenSim.Region.Environment.Scenes
1107 //proxy.PCode = (byte)PCode.ParticleSystem; 1107 //proxy.PCode = (byte)PCode.ParticleSystem;
1108 uint nextUUID = m_scene.NextLocalId; 1108 uint nextUUID = m_scene.NextLocalId;
1109 1109
1110 proxyObjectGroup = new SceneObjectGroup(m_scene, m_scene.RegionInfo.RegionHandle, UUID, nextUUID, Pos, Rotation, proxy); 1110 proxyObjectGroup = new SceneObjectGroup(UUID, nextUUID, Pos, Rotation, proxy);
1111 if (proxyObjectGroup != null) 1111 proxyObjectGroup.AttachToScene(m_scene);
1112 { 1112
1113 // Commented out this code since it could never have executed, but might still be informative.
1114// if (proxyObjectGroup != null)
1115// {
1113 proxyObjectGroup.SendGroupFullUpdate(); 1116 proxyObjectGroup.SendGroupFullUpdate();
1114 remote_client.SendSitResponse(proxyObjectGroup.UUID, Vector3.Zero, Quaternion.Identity, true, Vector3.Zero, Vector3.Zero, false); 1117 remote_client.SendSitResponse(proxyObjectGroup.UUID, Vector3.Zero, Quaternion.Identity, true, Vector3.Zero, Vector3.Zero, false);
1115 m_scene.DeleteSceneObject(proxyObjectGroup); 1118 m_scene.DeleteSceneObject(proxyObjectGroup);
1116 } 1119// }
1117 else 1120// else
1118 { 1121// {
1119 m_autopilotMoving = false; 1122// m_autopilotMoving = false;
1120 m_autoPilotTarget = Vector3.Zero; 1123// m_autoPilotTarget = Vector3.Zero;
1121 ControllingClient.SendAlertMessage("Autopilot cancelled"); 1124// ControllingClient.SendAlertMessage("Autopilot cancelled");
1122 } 1125// }
1123
1124 } 1126 }
1125 1127
1126 private void CheckAtSitTarget() 1128 private void CheckAtSitTarget()