diff options
author | Diva Canto | 2016-06-22 18:10:12 -0700 |
---|---|---|
committer | Diva Canto | 2016-06-22 18:10:12 -0700 |
commit | 33efc91342a309855c1e897b842a05e5550c91a0 (patch) | |
tree | 103af4ac228cd87604bd60bf30fe936fe3e9bbfd /OpenSim/Region | |
parent | Mantis #7802: added debug message to diagnose the problem. (diff) | |
download | opensim-SC_OLD-33efc91342a309855c1e897b842a05e5550c91a0.zip opensim-SC_OLD-33efc91342a309855c1e897b842a05e5550c91a0.tar.gz opensim-SC_OLD-33efc91342a309855c1e897b842a05e5550c91a0.tar.bz2 opensim-SC_OLD-33efc91342a309855c1e897b842a05e5550c91a0.tar.xz |
Mantis #7802: set culture to US English on the thread that does the agent crossing, not that it's async and needs to parse decimal numbers.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 8beed93..94d6820 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1470,11 +1470,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1470 | return true; | 1470 | return true; |
1471 | } | 1471 | } |
1472 | 1472 | ||
1473 | public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, EntityTransferContext ctx, out Vector3 newpos) | ||
1474 | { | ||
1475 | string r = String.Empty; | ||
1476 | return GetDestination(scene, agentID, pos, ctx, out newpos, out r); | ||
1477 | } | ||
1478 | 1473 | ||
1479 | // Given a position relative to the current region and outside of it | 1474 | // Given a position relative to the current region and outside of it |
1480 | // find the new region that the point is actually in. | 1475 | // find the new region that the point is actually in. |
@@ -1562,6 +1557,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1562 | EntityTransferContext ctx = new EntityTransferContext(); | 1557 | EntityTransferContext ctx = new EntityTransferContext(); |
1563 | string failureReason; | 1558 | string failureReason; |
1564 | 1559 | ||
1560 | // We need this because of decimal number parsing of the protocols. | ||
1561 | Culture.SetCurrentCulture(); | ||
1562 | |||
1565 | Vector3 pos = agent.AbsolutePosition + agent.Velocity; | 1563 | Vector3 pos = agent.AbsolutePosition + agent.Velocity; |
1566 | 1564 | ||
1567 | GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, pos, | 1565 | GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, pos, |