diff options
author | UbitUmarov | 2018-09-26 22:32:34 +0100 |
---|---|---|
committer | UbitUmarov | 2018-09-26 22:32:34 +0100 |
commit | 37dcb8722c8bdb110dc9ad2f8e330dd93cdf402c (patch) | |
tree | abc1c4e746f65d5e3b72666fee23a0523bb41d66 /OpenSim | |
parent | mantis 8372: replace XMLRPC.dll with utf8 fix (diff) | |
download | opensim-SC-37dcb8722c8bdb110dc9ad2f8e330dd93cdf402c.zip opensim-SC-37dcb8722c8bdb110dc9ad2f8e330dd93cdf402c.tar.gz opensim-SC-37dcb8722c8bdb110dc9ad2f8e330dd93cdf402c.tar.bz2 opensim-SC-37dcb8722c8bdb110dc9ad2f8e330dd93cdf402c.tar.xz |
make sure Culture is right on some spots
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 4 | ||||
-rw-r--r-- | 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 | |||
156 | string theirVersionStr = args["my_version"].AsString(); | 156 | string theirVersionStr = args["my_version"].AsString(); |
157 | string[] parts = theirVersionStr.Split(new char[] {'/'}); | 157 | string[] parts = theirVersionStr.Split(new char[] {'/'}); |
158 | if (parts.Length > 1) | 158 | if (parts.Length > 1) |
159 | theirVersion = float.Parse(parts[1]); | 159 | theirVersion = float.Parse(parts[1], Culture.FormatProvider); |
160 | } | 160 | } |
161 | 161 | ||
162 | if (args.ContainsKey("context")) | 162 | if (args.ContainsKey("context")) |
@@ -266,7 +266,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
266 | 266 | ||
267 | resp["success"] = OSD.FromBoolean(result); | 267 | resp["success"] = OSD.FromBoolean(result); |
268 | resp["reason"] = OSD.FromString(reason); | 268 | resp["reason"] = OSD.FromString(reason); |
269 | string legacyVersion = String.Format("SIMULATION/{0}", version); | 269 | string legacyVersion = String.Format(Culture.FormatProvider,"SIMULATION/{0}", version); |
270 | resp["version"] = OSD.FromString(legacyVersion); | 270 | resp["version"] = OSD.FromString(legacyVersion); |
271 | resp["negotiated_inbound_version"] = OSD.FromReal(inboundVersion); | 271 | resp["negotiated_inbound_version"] = OSD.FromReal(inboundVersion); |
272 | resp["negotiated_outbound_version"] = OSD.FromReal(outboundVersion); | 272 | 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 | |||
347 | String[] parts = versionString.Split(new char[] {'/'}); | 347 | String[] parts = versionString.Split(new char[] {'/'}); |
348 | if (parts.Length > 1) | 348 | if (parts.Length > 1) |
349 | { | 349 | { |
350 | ctx.InboundVersion = float.Parse(parts[1]); | 350 | ctx.InboundVersion = float.Parse(parts[1], Culture.FormatProvider); |
351 | ctx.OutboundVersion = float.Parse(parts[1]); | 351 | ctx.OutboundVersion = float.Parse(parts[1], Culture.FormatProvider); |
352 | } | 352 | } |
353 | } | 353 | } |
354 | 354 | ||