diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 3b13e64..d08237e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -41,6 +41,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
41 | using OpenSim.Region.PhysicsModules.SharedBase; | 41 | using OpenSim.Region.PhysicsModules.SharedBase; |
42 | using OpenSim.Region.Framework.Scenes.Serialization; | 42 | using OpenSim.Region.Framework.Scenes.Serialization; |
43 | using PermissionMask = OpenSim.Framework.PermissionMask; | 43 | using PermissionMask = OpenSim.Framework.PermissionMask; |
44 | using OpenSim.Services.Interfaces; | ||
44 | 45 | ||
45 | namespace OpenSim.Region.Framework.Scenes | 46 | namespace OpenSim.Region.Framework.Scenes |
46 | { | 47 | { |
@@ -476,7 +477,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
476 | ) | 477 | ) |
477 | { | 478 | { |
478 | IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); | 479 | IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); |
479 | float version = 0f; | 480 | EntityTransferContext ctx = new EntityTransferContext(); |
480 | Vector3 newpos = Vector3.Zero; | 481 | Vector3 newpos = Vector3.Zero; |
481 | string failureReason = String.Empty; | 482 | string failureReason = String.Empty; |
482 | OpenSim.Services.Interfaces.GridRegion destination = null; | 483 | OpenSim.Services.Interfaces.GridRegion destination = null; |
@@ -496,7 +497,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
496 | 497 | ||
497 | // We set the avatar position as being the object | 498 | // We set the avatar position as being the object |
498 | // position to get the region to send to | 499 | // position to get the region to send to |
499 | if ((destination = entityTransfer.GetDestination(m_scene, av.UUID, val, out version, out newpos, out failureReason)) == null) | 500 | if ((destination = entityTransfer.GetDestination(m_scene, av.UUID, val, ctx, out newpos, out failureReason)) == null) |
500 | { | 501 | { |
501 | canCross = false; | 502 | canCross = false; |
502 | break; | 503 | break; |
@@ -557,14 +558,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
557 | // threads rather than any replace threadpool that we might be using. | 558 | // threads rather than any replace threadpool that we might be using. |
558 | if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest) | 559 | if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest) |
559 | { | 560 | { |
560 | entityTransfer.CrossAgentToNewRegionAsync(av, val, destination, av.Flying, version); | 561 | entityTransfer.CrossAgentToNewRegionAsync(av, val, destination, av.Flying, ctx); |
561 | CrossAgentToNewRegionCompleted(av); | 562 | CrossAgentToNewRegionCompleted(av); |
562 | } | 563 | } |
563 | else | 564 | else |
564 | { | 565 | { |
565 | CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync; | 566 | CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync; |
566 | d.BeginInvoke( | 567 | d.BeginInvoke( |
567 | av, val, destination, av.Flying, version, | 568 | av, val, destination, av.Flying, ctx, |
568 | ar => CrossAgentToNewRegionCompleted(d.EndInvoke(ar)), null); | 569 | ar => CrossAgentToNewRegionCompleted(d.EndInvoke(ar)), null); |
569 | } | 570 | } |
570 | } | 571 | } |