From 33efc91342a309855c1e897b842a05e5550c91a0 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 22 Jun 2016 18:10:12 -0700 Subject: 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. --- .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'OpenSim') 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 return true; } - public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, EntityTransferContext ctx, out Vector3 newpos) - { - string r = String.Empty; - return GetDestination(scene, agentID, pos, ctx, out newpos, out r); - } // Given a position relative to the current region and outside of it // find the new region that the point is actually in. @@ -1562,6 +1557,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer EntityTransferContext ctx = new EntityTransferContext(); string failureReason; + // We need this because of decimal number parsing of the protocols. + Culture.SetCurrentCulture(); + Vector3 pos = agent.AbsolutePosition + agent.Velocity; GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, pos, -- cgit v1.1