diff --git a/LibreMetaverse.LslTools/Tools/SymbolType.cs b/LibreMetaverse.LslTools/Tools/SymbolType.cs index dcd659bc..704c7544 100644 --- a/LibreMetaverse.LslTools/Tools/SymbolType.cs +++ b/LibreMetaverse.LslTools/Tools/SymbolType.cs @@ -24,6 +24,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +using System; + namespace LibreMetaverse.LslTools { public class SymbolType @@ -39,7 +41,7 @@ namespace LibreMetaverse.LslTools public SymbolType(SymbolsGen yyp, string name, bool defined) { Lexer lexer = yyp.m_lexer; - int length = name.IndexOf("+"); + int length = name.IndexOf("+", StringComparison.Ordinal); int num = 0; if (length > 0) { diff --git a/LibreMetaverse.StructuredData/JSON/JsonData.cs b/LibreMetaverse.StructuredData/JSON/JsonData.cs index 51ce37d3..c84431cf 100644 --- a/LibreMetaverse.StructuredData/JSON/JsonData.cs +++ b/LibreMetaverse.StructuredData/JSON/JsonData.cs @@ -14,6 +14,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Collections.Specialized; +using System.Globalization; using System.IO; using System.Linq; @@ -847,7 +848,7 @@ namespace LitJson return inst_boolean.ToString (); case JsonType.Double: - return inst_double.ToString (); + return inst_double.ToString (CultureInfo.InvariantCulture); case JsonType.Int: return inst_int.ToString (); diff --git a/LibreMetaverse/Assets/Archiving/OarFile.cs b/LibreMetaverse/Assets/Archiving/OarFile.cs index 56748633..99eb2a55 100644 --- a/LibreMetaverse/Assets/Archiving/OarFile.cs +++ b/LibreMetaverse/Assets/Archiving/OarFile.cs @@ -26,6 +26,7 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.IO; using System.IO.Compression; using System.Xml; @@ -427,13 +428,13 @@ namespace OpenMetaverse.Assets } xtw.WriteEndElement(); - xtw.WriteElementString("PassHours", Convert.ToString(parcel.PassHours)); + xtw.WriteElementString("PassHours", Convert.ToString(parcel.PassHours, CultureInfo.InvariantCulture)); xtw.WriteElementString("PassPrice", Convert.ToString(parcel.PassPrice)); xtw.WriteElementString("SalePrice", Convert.ToString(parcel.SalePrice)); xtw.WriteElementString("SnapshotID", parcel.SnapshotID.ToString()); xtw.WriteElementString("UserLocation", parcel.UserLocation.ToString()); xtw.WriteElementString("UserLookAt", parcel.UserLookAt.ToString()); - xtw.WriteElementString("Dwell", parcel.Dwell.ToString()); + xtw.WriteElementString("Dwell", parcel.Dwell.ToString(CultureInfo.InvariantCulture)); xtw.WriteElementString("SeeAVs", parcel.SeeAVs.ToString()); xtw.WriteElementString("AnyAVSounds", parcel.AnyAVSounds.ToString()); xtw.WriteElementString("GroupAVSounds", parcel.GroupAVSounds.ToString()); @@ -705,7 +706,7 @@ namespace OpenMetaverse.Assets WriteUUID(writer, "AssetID", item.AssetID); writer.WriteElementString("BasePermissions", item.PermsBase.ToString()); - writer.WriteElementString("CreationDate", (item.CreationDate.ToUniversalTime() - Utils.Epoch).TotalSeconds.ToString()); + writer.WriteElementString("CreationDate", (item.CreationDate.ToUniversalTime() - Utils.Epoch).TotalSeconds.ToString(CultureInfo.InvariantCulture)); WriteUUID(writer, "CreatorID", item.CreatorID); writer.WriteElementString("Description", item.Description); writer.WriteElementString("EveryonePermissions", item.PermsEveryone.ToString()); diff --git a/LibreMetaverse/Assets/Archiving/RegionSettings.cs b/LibreMetaverse/Assets/Archiving/RegionSettings.cs index 24a976b9..274522cf 100644 --- a/LibreMetaverse/Assets/Archiving/RegionSettings.cs +++ b/LibreMetaverse/Assets/Archiving/RegionSettings.cs @@ -1,4 +1,5 @@ using System; +using System.Globalization; using System.IO; using System.Xml; @@ -191,7 +192,7 @@ namespace OpenMetaverse.Assets writer.WriteElementString("MaturityRating", MaturityRating.ToString()); WriteBoolean(writer, "RestrictPushing", RestrictPushing); writer.WriteElementString("AgentLimit", AgentLimit.ToString()); - writer.WriteElementString("ObjectBonus", ObjectBonus.ToString()); + writer.WriteElementString("ObjectBonus", ObjectBonus.ToString(CultureInfo.InvariantCulture)); writer.WriteEndElement(); writer.WriteStartElement(String.Empty, "GroundTextures", String.Empty); @@ -200,21 +201,21 @@ namespace OpenMetaverse.Assets writer.WriteElementString("Texture2", TerrainDetail1.ToString()); writer.WriteElementString("Texture3", TerrainDetail2.ToString()); writer.WriteElementString("Texture4", TerrainDetail3.ToString()); - writer.WriteElementString("ElevationLowSW", TerrainStartHeight00.ToString()); - writer.WriteElementString("ElevationLowNW", TerrainStartHeight01.ToString()); - writer.WriteElementString("ElevationLowSE", TerrainStartHeight10.ToString()); - writer.WriteElementString("ElevationLowNE", TerrainStartHeight11.ToString()); - writer.WriteElementString("ElevationHighSW", TerrainHeightRange00.ToString()); - writer.WriteElementString("ElevationHighNW", TerrainHeightRange01.ToString()); - writer.WriteElementString("ElevationHighSE", TerrainHeightRange10.ToString()); - writer.WriteElementString("ElevationHighNE", TerrainHeightRange11.ToString()); + writer.WriteElementString("ElevationLowSW", TerrainStartHeight00.ToString(CultureInfo.InvariantCulture)); + writer.WriteElementString("ElevationLowNW", TerrainStartHeight01.ToString(CultureInfo.InvariantCulture)); + writer.WriteElementString("ElevationLowSE", TerrainStartHeight10.ToString(CultureInfo.InvariantCulture)); + writer.WriteElementString("ElevationLowNE", TerrainStartHeight11.ToString(CultureInfo.InvariantCulture)); + writer.WriteElementString("ElevationHighSW", TerrainHeightRange00.ToString(CultureInfo.InvariantCulture)); + writer.WriteElementString("ElevationHighNW", TerrainHeightRange01.ToString(CultureInfo.InvariantCulture)); + writer.WriteElementString("ElevationHighSE", TerrainHeightRange10.ToString(CultureInfo.InvariantCulture)); + writer.WriteElementString("ElevationHighNE", TerrainHeightRange11.ToString(CultureInfo.InvariantCulture)); writer.WriteEndElement(); writer.WriteStartElement(String.Empty, "Terrain", String.Empty); - writer.WriteElementString("WaterHeight", WaterHeight.ToString()); - writer.WriteElementString("TerrainRaiseLimit", TerrainRaiseLimit.ToString()); - writer.WriteElementString("TerrainLowerLimit", TerrainLowerLimit.ToString()); + writer.WriteElementString("WaterHeight", WaterHeight.ToString(CultureInfo.InvariantCulture)); + writer.WriteElementString("TerrainRaiseLimit", TerrainRaiseLimit.ToString(CultureInfo.InvariantCulture)); + writer.WriteElementString("TerrainLowerLimit", TerrainLowerLimit.ToString(CultureInfo.InvariantCulture)); WriteBoolean(writer, "UseEstateSun", UseEstateSun); WriteBoolean(writer, "FixedSun", FixedSun); diff --git a/LibreMetaverse/EstateTools.cs b/LibreMetaverse/EstateTools.cs index 12761e0a..39699822 100644 --- a/LibreMetaverse/EstateTools.cs +++ b/LibreMetaverse/EstateTools.cs @@ -28,6 +28,7 @@ using OpenMetaverse.Packets; using OpenMetaverse.Interfaces; using OpenMetaverse.Messages.Linden; using System.Collections.Generic; +using System.Globalization; namespace OpenMetaverse { @@ -570,15 +571,15 @@ namespace OpenMetaverse public void SetRegionInfo(bool blockTerraform, bool blockFly, bool allowDamage, bool allowLandResell, bool restrictPushing, bool allowParcelJoinDivide, float agentLimit, float objectBonus, bool mature) { List listParams = new List(); - if (blockTerraform) listParams.Add("Y"); else listParams.Add("N"); - if (blockFly) listParams.Add("Y"); else listParams.Add("N"); - if (allowDamage) listParams.Add("Y"); else listParams.Add("N"); - if (allowLandResell) listParams.Add("Y"); else listParams.Add("N"); - listParams.Add(agentLimit.ToString()); - listParams.Add(objectBonus.ToString()); - if (mature) listParams.Add("21"); else listParams.Add("13"); //FIXME - enumerate these settings - if (restrictPushing) listParams.Add("Y"); else listParams.Add("N"); - if (allowParcelJoinDivide) listParams.Add("Y"); else listParams.Add("N"); + listParams.Add(blockTerraform ? "Y" : "N"); + listParams.Add(blockFly ? "Y" : "N"); + listParams.Add(allowDamage ? "Y" : "N"); + listParams.Add(allowLandResell ? "Y" : "N"); + listParams.Add(agentLimit.ToString(CultureInfo.InvariantCulture)); + listParams.Add(objectBonus.ToString(CultureInfo.InvariantCulture)); + listParams.Add(mature ? "21" : "13"); //FIXME - enumerate these settings + listParams.Add(restrictPushing ? "Y" : "N"); + listParams.Add(allowParcelJoinDivide ? "Y" : "N"); EstateOwnerMessage("setregioninfo", listParams); } @@ -586,9 +587,9 @@ namespace OpenMetaverse public void SetRegionDebug(bool disableScripts, bool disableCollisions, bool disablePhysics) { List listParams = new List(); - if (disableScripts) listParams.Add("Y"); else listParams.Add("N"); - if (disableCollisions) listParams.Add("Y"); else listParams.Add("N"); - if (disablePhysics) listParams.Add("Y"); else listParams.Add("N"); + listParams.Add(disableScripts ? "Y" : "N"); + listParams.Add(disableCollisions ? "Y" : "N"); + listParams.Add(disablePhysics ? "Y" : "N"); EstateOwnerMessage("setregiondebug", listParams); }