diff --git a/OpenMetaverse/AssetTypes.cs b/OpenMetaverse/AssetTypes.cs
index 1d24f9bd..025054cf 100644
--- a/OpenMetaverse/AssetTypes.cs
+++ b/OpenMetaverse/AssetTypes.cs
@@ -404,7 +404,7 @@ namespace OpenMetaverse
fields[1] = fields[1].Replace(',', '.');
float weight = float.Parse(fields[1], System.Globalization.NumberStyles.Float,
- Helpers.EnUsCulture.NumberFormat);
+ Utils.EnUsCulture.NumberFormat);
Params[id] = weight;
}
diff --git a/OpenMetaverse/GridManager.cs b/OpenMetaverse/GridManager.cs
index acc6a09d..cc6b0e61 100644
--- a/OpenMetaverse/GridManager.cs
+++ b/OpenMetaverse/GridManager.cs
@@ -107,17 +107,8 @@ namespace OpenMetaverse
///
public override string ToString()
{
- StringBuilder output = new StringBuilder("GridRegion: ");
- output.Append(Name); output.Append(Helpers.NewLine);
- output.Append("RegionHandle: " + RegionHandle); output.Append(Helpers.NewLine);
- output.Append(String.Format("X: {0} Y: {1}", X, Y)); output.Append(Helpers.NewLine);
- output.Append("MapImageID: " + MapImageID.ToString()); output.Append(Helpers.NewLine);
- output.Append("Access: " + Access); output.Append(Helpers.NewLine);
- output.Append("RegionFlags: " + RegionFlags); output.Append(Helpers.NewLine);
- output.Append("WaterHeight: " + WaterHeight); output.Append(Helpers.NewLine);
- output.Append("Agents: " + Agents);
-
- return output.ToString();
+ return String.Format("{0} ({1}/{2}), Handle: {3}, MapImage: {4}, Access: {5}, Flags: {6}",
+ Name, X, Y, RegionHandle, MapImageID, Access, RegionFlags);
}
///
diff --git a/OpenMetaverse/Helpers.cs b/OpenMetaverse/Helpers.cs
index d4624484..9f2d4963 100644
--- a/OpenMetaverse/Helpers.cs
+++ b/OpenMetaverse/Helpers.cs
@@ -45,8 +45,6 @@ namespace OpenMetaverse
/// This header flag signals that the message is compressed using zerocoding
public const byte MSG_ZEROCODED = 0x80;
- public static readonly string NewLine = Environment.NewLine;
-
///
/// Passed to Logger.Log() to identify the severity of a log entry
///
@@ -72,12 +70,6 @@ namespace OpenMetaverse
Debug
};
- /// Provide a single instance of the CultureInfo class to
- /// help parsing in situations where the grid assumes an en-us
- /// culture
- public static readonly System.Globalization.CultureInfo EnUsCulture =
- new System.Globalization.CultureInfo("en-us");
-
///
///
///
diff --git a/OpenMetaverse/InventoryManager.cs b/OpenMetaverse/InventoryManager.cs
index 5951db0c..51747c0f 100644
--- a/OpenMetaverse/InventoryManager.cs
+++ b/OpenMetaverse/InventoryManager.cs
@@ -2871,7 +2871,7 @@ namespace OpenMetaverse
}
else
{
- Logger.Log("Unrecognized token " + key + " in: " + Helpers.NewLine + taskData,
+ Logger.Log("Unrecognized token " + key + " in: " + Environment.NewLine + taskData,
Helpers.LogLevel.Error);
}
}
diff --git a/OpenMetaverse/Primitives/TextureEntry.cs b/OpenMetaverse/Primitives/TextureEntry.cs
index 08cf4f28..8534744c 100644
--- a/OpenMetaverse/Primitives/TextureEntry.cs
+++ b/OpenMetaverse/Primitives/TextureEntry.cs
@@ -1073,12 +1073,12 @@ namespace OpenMetaverse
{
string output = String.Empty;
- output += "Default Face: " + DefaultTexture.ToString() + Helpers.NewLine;
+ output += "Default Face: " + DefaultTexture.ToString() + Environment.NewLine;
for (int i = 0; i < FaceTextures.Length; i++)
{
if (FaceTextures[i] != null)
- output += "Face " + i + ": " + FaceTextures[i].ToString() + Helpers.NewLine;
+ output += "Face " + i + ": " + FaceTextures[i].ToString() + Environment.NewLine;
}
return output;
diff --git a/OpenMetaverse/StructuredData/NotationLLSD.cs b/OpenMetaverse/StructuredData/NotationLLSD.cs
index 9779dbe4..b1c2abd3 100644
--- a/OpenMetaverse/StructuredData/NotationLLSD.cs
+++ b/OpenMetaverse/StructuredData/NotationLLSD.cs
@@ -536,7 +536,7 @@ namespace OpenMetaverse.StructuredData
private static void SerializeLLSDNotationArrayFormatted(StringWriter writer, string intend, OSDArray osdArray)
{
- writer.Write(Helpers.NewLine);
+ writer.WriteLine();
writer.Write(intend);
writer.Write(arrayBeginNotationMarker);
int lastIndex = osdArray.Count - 1;
@@ -544,7 +544,7 @@ namespace OpenMetaverse.StructuredData
for (int idx = 0; idx <= lastIndex; idx++)
{
if (osdArray[idx].Type != OSDType.Array && osdArray[idx].Type != OSDType.Map)
- writer.Write(Helpers.NewLine);
+ writer.WriteLine();
writer.Write(intend + baseIndent);
SerializeLLSDNotationElementFormatted(writer, intend, osdArray[idx]);
if (idx < lastIndex)
@@ -552,17 +552,17 @@ namespace OpenMetaverse.StructuredData
writer.Write(kommaNotationDelimiter);
}
}
- writer.Write(Helpers.NewLine);
+ writer.WriteLine();
writer.Write(intend);
writer.Write(arrayEndNotationMarker);
}
private static void SerializeLLSDNotationMapFormatted(StringWriter writer, string intend, OSDMap osdMap)
{
- writer.Write(Helpers.NewLine);
+ writer.WriteLine();
writer.Write(intend);
writer.Write(mapBeginNotationMarker);
- writer.Write(Helpers.NewLine);
+ writer.WriteLine();
int lastIndex = osdMap.Count - 1;
int idx = 0;
@@ -576,15 +576,15 @@ namespace OpenMetaverse.StructuredData
SerializeLLSDNotationElementFormatted(writer, intend, kvp.Value);
if (idx < lastIndex)
{
- writer.Write(Helpers.NewLine);
+ writer.WriteLine();
writer.Write(intend + baseIndent);
writer.Write(kommaNotationDelimiter);
- writer.Write(Helpers.NewLine);
+ writer.WriteLine();
}
idx++;
}
- writer.Write(Helpers.NewLine);
+ writer.WriteLine();
writer.Write(intend);
writer.Write(mapEndNotationMarker);
}
diff --git a/OpenMetaverse/StructuredData/StructuredData.cs b/OpenMetaverse/StructuredData/StructuredData.cs
index 82688277..eb96998d 100644
--- a/OpenMetaverse/StructuredData/StructuredData.cs
+++ b/OpenMetaverse/StructuredData/StructuredData.cs
@@ -408,7 +408,7 @@ namespace OpenMetaverse.StructuredData
}
public override double AsReal() { return value; }
- public override string AsString() { return value.ToString(Helpers.EnUsCulture); }
+ public override string AsString() { return value.ToString(Utils.EnUsCulture); }
public override byte[] AsBinary() { return Utils.DoubleToBytes(value); }
public override string ToString() { return AsString(); }
}
diff --git a/OpenMetaverse/StructuredData/XmlLLSD.cs b/OpenMetaverse/StructuredData/XmlLLSD.cs
index 75057109..6b2a4e9a 100644
--- a/OpenMetaverse/StructuredData/XmlLLSD.cs
+++ b/OpenMetaverse/StructuredData/XmlLLSD.cs
@@ -634,7 +634,7 @@ namespace OpenMetaverse.StructuredData
if (LastXmlErrors == String.Empty)
LastXmlErrors = error;
else
- LastXmlErrors += Helpers.NewLine + error;
+ LastXmlErrors += Environment.NewLine + error;
}
}
}