From 37dcb8722c8bdb110dc9ad2f8e330dd93cdf402c Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 26 Sep 2018 22:32:34 +0100 Subject: make sure Culture is right on some spots --- OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 4 ++-- OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index c52a1ab..1c1930a 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs @@ -156,7 +156,7 @@ namespace OpenSim.Server.Handlers.Simulation string theirVersionStr = args["my_version"].AsString(); string[] parts = theirVersionStr.Split(new char[] {'/'}); if (parts.Length > 1) - theirVersion = float.Parse(parts[1]); + theirVersion = float.Parse(parts[1], Culture.FormatProvider); } if (args.ContainsKey("context")) @@ -266,7 +266,7 @@ namespace OpenSim.Server.Handlers.Simulation resp["success"] = OSD.FromBoolean(result); resp["reason"] = OSD.FromString(reason); - string legacyVersion = String.Format("SIMULATION/{0}", version); + string legacyVersion = String.Format(Culture.FormatProvider,"SIMULATION/{0}", version); resp["version"] = OSD.FromString(legacyVersion); resp["negotiated_inbound_version"] = OSD.FromReal(inboundVersion); resp["negotiated_outbound_version"] = OSD.FromReal(outboundVersion); diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 03f6fe6..6504fdc 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs @@ -347,8 +347,8 @@ namespace OpenSim.Services.Connectors.Simulation String[] parts = versionString.Split(new char[] {'/'}); if (parts.Length > 1) { - ctx.InboundVersion = float.Parse(parts[1]); - ctx.OutboundVersion = float.Parse(parts[1]); + ctx.InboundVersion = float.Parse(parts[1], Culture.FormatProvider); + ctx.OutboundVersion = float.Parse(parts[1], Culture.FormatProvider); } } -- cgit v1.1