diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 196 |
1 files changed, 194 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index e31270c..9bd7632 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -121,6 +121,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
121 | private bool m_hasGroupChanged = false; | 121 | private bool m_hasGroupChanged = false; |
122 | private long timeFirstChanged; | 122 | private long timeFirstChanged; |
123 | private long timeLastChanged; | 123 | private long timeLastChanged; |
124 | private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>(); | ||
124 | 125 | ||
125 | /// <summary> | 126 | /// <summary> |
126 | /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage | 127 | /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage |
@@ -431,6 +432,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
431 | return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0)); | 432 | return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0)); |
432 | } | 433 | } |
433 | 434 | ||
435 | private struct avtocrossInfo | ||
436 | { | ||
437 | public ScenePresence av; | ||
438 | public uint ParentID; | ||
439 | } | ||
440 | |||
434 | /// <summary> | 441 | /// <summary> |
435 | /// The absolute position of this scene object in the scene | 442 | /// The absolute position of this scene object in the scene |
436 | /// </summary> | 443 | /// </summary> |
@@ -458,13 +465,124 @@ namespace OpenSim.Region.Framework.Scenes | |||
458 | || Scene.TestBorderCross(val, Cardinals.S)) | 465 | || Scene.TestBorderCross(val, Cardinals.S)) |
459 | && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) | 466 | && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) |
460 | { | 467 | { |
468 | IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); | ||
469 | uint x = 0; | ||
470 | uint y = 0; | ||
471 | string version = String.Empty; | ||
472 | Vector3 newpos = Vector3.Zero; | ||
473 | OpenSim.Services.Interfaces.GridRegion destination = null; | ||
474 | |||
461 | if (m_rootPart.KeyframeMotion != null) | 475 | if (m_rootPart.KeyframeMotion != null) |
462 | m_rootPart.KeyframeMotion.StartCrossingCheck(); | 476 | m_rootPart.KeyframeMotion.StartCrossingCheck(); |
463 | 477 | ||
464 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); | 478 | bool canCross = true; |
479 | foreach (ScenePresence av in m_linkedAvatars) | ||
480 | { | ||
481 | // We need to cross these agents. First, let's find | ||
482 | // out if any of them can't cross for some reason. | ||
483 | // We have to deny the crossing entirely if any | ||
484 | // of them are banned. Alternatively, we could | ||
485 | // unsit banned agents.... | ||
486 | |||
487 | |||
488 | // We set the avatar position as being the object | ||
489 | // position to get the region to send to | ||
490 | if ((destination = entityTransfer.GetDestination(m_scene, av.UUID, val, out x, out y, out version, out newpos)) == null) | ||
491 | { | ||
492 | canCross = false; | ||
493 | break; | ||
494 | } | ||
495 | |||
496 | m_log.DebugFormat("[SCENE OBJECT]: Avatar {0} needs to be crossed to {1}", av.Name, destination.RegionName); | ||
497 | } | ||
498 | |||
499 | if (canCross) | ||
500 | { | ||
501 | // We unparent the SP quietly so that it won't | ||
502 | // be made to stand up | ||
503 | |||
504 | List<avtocrossInfo> avsToCross = new List<avtocrossInfo>(); | ||
505 | |||
506 | foreach (ScenePresence av in m_linkedAvatars) | ||
507 | { | ||
508 | avtocrossInfo avinfo = new avtocrossInfo(); | ||
509 | SceneObjectPart parentPart = m_scene.GetSceneObjectPart(av.ParentID); | ||
510 | if (parentPart != null) | ||
511 | av.ParentUUID = parentPart.UUID; | ||
512 | |||
513 | avinfo.av = av; | ||
514 | avinfo.ParentID = av.ParentID; | ||
515 | avsToCross.Add(avinfo); | ||
516 | |||
517 | av.PrevSitOffset = av.OffsetPosition; | ||
518 | av.ParentID = 0; | ||
519 | } | ||
520 | |||
521 | // m_linkedAvatars.Clear(); | ||
522 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); | ||
523 | |||
524 | // Normalize | ||
525 | if (val.X >= Constants.RegionSize) | ||
526 | val.X -= Constants.RegionSize; | ||
527 | if (val.Y >= Constants.RegionSize) | ||
528 | val.Y -= Constants.RegionSize; | ||
529 | if (val.X < 0) | ||
530 | val.X += Constants.RegionSize; | ||
531 | if (val.Y < 0) | ||
532 | val.Y += Constants.RegionSize; | ||
533 | |||
534 | // If it's deleted, crossing was successful | ||
535 | if (IsDeleted) | ||
536 | { | ||
537 | // foreach (ScenePresence av in m_linkedAvatars) | ||
538 | foreach (avtocrossInfo avinfo in avsToCross) | ||
539 | { | ||
540 | ScenePresence av = avinfo.av; | ||
541 | if (!av.IsInTransit) // just in case... | ||
542 | { | ||
543 | m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar {0} to {1}", av.Name, val); | ||
544 | |||
545 | av.IsInTransit = true; | ||
546 | |||
547 | CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync; | ||
548 | d.BeginInvoke(av, val, destination, av.Flying, version, CrossAgentToNewRegionCompleted, d); | ||
549 | } | ||
550 | else | ||
551 | m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar alreasy in transit {0} to {1}", av.Name, val); | ||
552 | } | ||
553 | avsToCross.Clear(); | ||
554 | return; | ||
555 | } | ||
556 | else // cross failed, put avas back ?? | ||
557 | { | ||
558 | foreach (avtocrossInfo avinfo in avsToCross) | ||
559 | { | ||
560 | ScenePresence av = avinfo.av; | ||
561 | av.ParentUUID = UUID.Zero; | ||
562 | av.ParentID = avinfo.ParentID; | ||
563 | // m_linkedAvatars.Add(av); | ||
564 | } | ||
565 | } | ||
566 | avsToCross.Clear(); | ||
567 | |||
568 | } | ||
569 | else | ||
570 | { | ||
571 | if (m_rootPart.KeyframeMotion != null) | ||
572 | m_rootPart.KeyframeMotion.CrossingFailure(); | ||
573 | |||
574 | if (RootPart.PhysActor != null) | ||
575 | { | ||
576 | RootPart.PhysActor.CrossingFailure(); | ||
577 | } | ||
578 | } | ||
579 | Vector3 oldp = AbsolutePosition; | ||
580 | val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)Constants.RegionSize - 0.5f); | ||
581 | val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)Constants.RegionSize - 0.5f); | ||
582 | val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f); | ||
465 | } | 583 | } |
466 | } | 584 | } |
467 | 585 | ||
468 | if (RootPart.GetStatusSandbox()) | 586 | if (RootPart.GetStatusSandbox()) |
469 | { | 587 | { |
470 | if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) | 588 | if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) |
@@ -498,6 +616,39 @@ namespace OpenSim.Region.Framework.Scenes | |||
498 | } | 616 | } |
499 | } | 617 | } |
500 | 618 | ||
619 | public override Vector3 Velocity | ||
620 | { | ||
621 | get { return RootPart.Velocity; } | ||
622 | set { RootPart.Velocity = value; } | ||
623 | } | ||
624 | |||
625 | private void CrossAgentToNewRegionCompleted(IAsyncResult iar) | ||
626 | { | ||
627 | CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState; | ||
628 | ScenePresence agent = icon.EndInvoke(iar); | ||
629 | |||
630 | //// If the cross was successful, this agent is a child agent | ||
631 | if (agent.IsChildAgent) | ||
632 | { | ||
633 | if (agent.ParentUUID != UUID.Zero) | ||
634 | { | ||
635 | agent.ParentPart = null; | ||
636 | // agent.ParentPosition = Vector3.Zero; | ||
637 | // agent.ParentUUID = UUID.Zero; | ||
638 | } | ||
639 | } | ||
640 | |||
641 | agent.ParentUUID = UUID.Zero; | ||
642 | // agent.Reset(); | ||
643 | // else // Not successful | ||
644 | // agent.RestoreInCurrentScene(); | ||
645 | |||
646 | // In any case | ||
647 | agent.IsInTransit = false; | ||
648 | |||
649 | m_log.DebugFormat("[SCENE OBJECT]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname); | ||
650 | } | ||
651 | |||
501 | public override uint LocalId | 652 | public override uint LocalId |
502 | { | 653 | { |
503 | get { return m_rootPart.LocalId; } | 654 | get { return m_rootPart.LocalId; } |
@@ -1099,6 +1250,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1099 | } | 1250 | } |
1100 | } | 1251 | } |
1101 | 1252 | ||
1253 | |||
1102 | /// <summary> | 1254 | /// <summary> |
1103 | /// | 1255 | /// |
1104 | /// </summary> | 1256 | /// </summary> |
@@ -1108,6 +1260,46 @@ namespace OpenSim.Region.Framework.Scenes | |||
1108 | part.ParentID = m_rootPart.LocalId; | 1260 | part.ParentID = m_rootPart.LocalId; |
1109 | part.ClearUndoState(); | 1261 | part.ClearUndoState(); |
1110 | } | 1262 | } |
1263 | /// <summary> | ||
1264 | /// Add the avatar to this linkset (avatar is sat). | ||
1265 | /// </summary> | ||
1266 | /// <param name="agentID"></param> | ||
1267 | public void AddAvatar(UUID agentID) | ||
1268 | { | ||
1269 | ScenePresence presence; | ||
1270 | if (m_scene.TryGetScenePresence(agentID, out presence)) | ||
1271 | { | ||
1272 | if (!m_linkedAvatars.Contains(presence)) | ||
1273 | { | ||
1274 | m_linkedAvatars.Add(presence); | ||
1275 | } | ||
1276 | } | ||
1277 | } | ||
1278 | |||
1279 | /// <summary> | ||
1280 | /// Delete the avatar from this linkset (avatar is unsat). | ||
1281 | /// </summary> | ||
1282 | /// <param name="agentID"></param> | ||
1283 | public void DeleteAvatar(UUID agentID) | ||
1284 | { | ||
1285 | ScenePresence presence; | ||
1286 | if (m_scene.TryGetScenePresence(agentID, out presence)) | ||
1287 | { | ||
1288 | if (m_linkedAvatars.Contains(presence)) | ||
1289 | { | ||
1290 | m_linkedAvatars.Remove(presence); | ||
1291 | } | ||
1292 | } | ||
1293 | } | ||
1294 | |||
1295 | /// <summary> | ||
1296 | /// Returns the list of linked presences (avatars sat on this group) | ||
1297 | /// </summary> | ||
1298 | /// <param name="agentID"></param> | ||
1299 | public List<ScenePresence> GetLinkedAvatars() | ||
1300 | { | ||
1301 | return m_linkedAvatars; | ||
1302 | } | ||
1111 | 1303 | ||
1112 | public ushort GetTimeDilation() | 1304 | public ushort GetTimeDilation() |
1113 | { | 1305 | { |