diff options
author | UbitUmarov | 2015-11-01 03:25:36 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-01 03:25:36 +0000 |
commit | 24472c3b67f0b79a8541093a63e2f0e859543117 (patch) | |
tree | c542d8c8a0fb90b5c206fcffe633d83b5b554ceb /OpenSim/Region | |
parent | Merge branch 'master' into avinationmerge (diff) | |
download | opensim-SC_OLD-24472c3b67f0b79a8541093a63e2f0e859543117.zip opensim-SC_OLD-24472c3b67f0b79a8541093a63e2f0e859543117.tar.gz opensim-SC_OLD-24472c3b67f0b79a8541093a63e2f0e859543117.tar.bz2 opensim-SC_OLD-24472c3b67f0b79a8541093a63e2f0e859543117.tar.xz |
fix merge issues
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 8a4ac1b..4d70c54 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1442,10 +1442,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1442 | 1442 | ||
1443 | #region Agent Crossings | 1443 | #region Agent Crossings |
1444 | 1444 | ||
1445 | public bool checkAgentAccessToRegion(ScenePresence agent, GridRegion destiny, Vector3 position, out string version, out string reason) | 1445 | public bool checkAgentAccessToRegion(ScenePresence agent, GridRegion destiny, Vector3 position, |
1446 | EntityTransferContext ctx, out string reason) | ||
1446 | { | 1447 | { |
1447 | reason = String.Empty; | 1448 | reason = String.Empty; |
1448 | version = String.Empty; | ||
1449 | 1449 | ||
1450 | UUID agentID = agent.UUID; | 1450 | UUID agentID = agent.UUID; |
1451 | ulong destinyHandle = destiny.RegionHandle; | 1451 | ulong destinyHandle = destiny.RegionHandle; |
@@ -1460,7 +1460,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1460 | 1460 | ||
1461 | 1461 | ||
1462 | if (!ascene.SimulationService.QueryAccess(destiny, agentID, homeURI, false, position, | 1462 | if (!ascene.SimulationService.QueryAccess(destiny, agentID, homeURI, false, position, |
1463 | m_myVersion, agent.Scene.GetFormatsOffered(), out version, out reason)) | 1463 | agent.Scene.GetFormatsOffered(), ctx, out reason)) |
1464 | { | 1464 | { |
1465 | m_bannedRegionCache.Add(destinyHandle, agentID, 30.0, 30.0); | 1465 | m_bannedRegionCache.Add(destinyHandle, agentID, 30.0, 30.0); |
1466 | return false; | 1466 | return false; |
@@ -1468,10 +1468,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1468 | return true; | 1468 | return true; |
1469 | } | 1469 | } |
1470 | 1470 | ||
1471 | public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos) | 1471 | public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, EntityTransferContext ctx, out Vector3 newpos) |
1472 | { | 1472 | { |
1473 | string r = String.Empty; | 1473 | string r = String.Empty; |
1474 | return GetDestination(scene, agentID, pos, out version, out newpos, out r); | 1474 | return GetDestination(scene, agentID, pos, ctx, out newpos, out r); |
1475 | } | 1475 | } |
1476 | 1476 | ||
1477 | // Given a position relative to the current region and outside of it | 1477 | // Given a position relative to the current region and outside of it |
@@ -1573,7 +1573,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1573 | 1573 | ||
1574 | // agent.IsInTransit = true; | 1574 | // agent.IsInTransit = true; |
1575 | 1575 | ||
1576 | CrossAgentToNewRegionAsync(agent, newpos, neighbourRegion, isFlying, version); | 1576 | CrossAgentToNewRegionAsync(agent, newpos, neighbourRegion, isFlying, ctx); |
1577 | agent.IsInTransit = false; | 1577 | agent.IsInTransit = false; |
1578 | return agent; | 1578 | return agent; |
1579 | } | 1579 | } |
@@ -1787,14 +1787,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1787 | capsPath); | 1787 | capsPath); |
1788 | } | 1788 | } |
1789 | 1789 | ||
1790 | /* | ||
1790 | // Backwards compatibility. Best effort | 1791 | // Backwards compatibility. Best effort |
1791 | if (version == "Unknown" || version == string.Empty) | 1792 | if (version == 0f) |
1792 | { | 1793 | { |
1793 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one..."); | 1794 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one..."); |
1794 | Thread.Sleep(3000); // wait a little now that we're not waiting for the callback | 1795 | Thread.Sleep(3000); // wait a little now that we're not waiting for the callback |
1795 | CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true); | 1796 | CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true); |
1796 | } | 1797 | } |
1797 | 1798 | */ | |
1798 | // SUCCESS! | 1799 | // SUCCESS! |
1799 | m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination); | 1800 | m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination); |
1800 | 1801 | ||