OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure Culture is right on some spots

0.9.1.0-post-fixes
UbitUmarov 2018-09-26 22:32:34 +01:00
parent a5d6a394ef
commit 37dcb8722c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
View File

@ -156,7 +156,7 @@ namespace OpenSim.Server.Handlers.Simulation
string theirVersionStr = args["my_version"].AsString(); string theirVersionStr = args["my_version"].AsString();
string[] parts = theirVersionStr.Split(new char[] {'/'}); string[] parts = theirVersionStr.Split(new char[] {'/'});
if (parts.Length > 1) if (parts.Length > 1)
theirVersion = float.Parse(parts[1]); theirVersion = float.Parse(parts[1], Culture.FormatProvider);
} }
if (args.ContainsKey("context")) if (args.ContainsKey("context"))
@ -266,7 +266,7 @@ namespace OpenSim.Server.Handlers.Simulation
resp["success"] = OSD.FromBoolean(result); resp["success"] = OSD.FromBoolean(result);
resp["reason"] = OSD.FromString(reason); 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["version"] = OSD.FromString(legacyVersion);
resp["negotiated_inbound_version"] = OSD.FromReal(inboundVersion); resp["negotiated_inbound_version"] = OSD.FromReal(inboundVersion);
resp["negotiated_outbound_version"] = OSD.FromReal(outboundVersion); resp["negotiated_outbound_version"] = OSD.FromReal(outboundVersion);

4
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@ -347,8 +347,8 @@ namespace OpenSim.Services.Connectors.Simulation
String[] parts = versionString.Split(new char[] {'/'}); String[] parts = versionString.Split(new char[] {'/'});
if (parts.Length > 1) if (parts.Length > 1)
{ {
ctx.InboundVersion = float.Parse(parts[1]); ctx.InboundVersion = float.Parse(parts[1], Culture.FormatProvider);
ctx.OutboundVersion = float.Parse(parts[1]); ctx.OutboundVersion = float.Parse(parts[1], Culture.FormatProvider);
} }
} }