diff --git a/LibreMetaverse.LslTools/Tools/Arc.cs b/LibreMetaverse.LslTools/Tools/Arc.cs
index 3df8eff2..905bc7d0 100644
--- a/LibreMetaverse.LslTools/Tools/Arc.cs
+++ b/LibreMetaverse.LslTools/Tools/Arc.cs
@@ -50,7 +50,7 @@ namespace LibreMetaverse.LslTools
public virtual void Print(TextWriter s)
{
- s.WriteLine(string.Format(" {0} {1}", (object) this.m_ch, (object) this.m_next.m_state));
+ s.WriteLine($" {(object)this.m_ch} {(object)this.m_next.m_state}");
}
}
}
diff --git a/LibreMetaverse.LslTools/Tools/Parser.cs b/LibreMetaverse.LslTools/Tools/Parser.cs
index 8b02d90d..625cd725 100644
--- a/LibreMetaverse.LslTools/Tools/Parser.cs
+++ b/LibreMetaverse.LslTools/Tools/Parser.cs
@@ -138,9 +138,10 @@ namespace LibreMetaverse.LslTools
if (this.m_debug)
{
if (yyname.Equals("TOKEN"))
- Console.WriteLine(string.Format("State {0} with {1} \"{2}\"", (object) s.m_state, (object) yyname, (object) ((TOKEN) s.m_value).yytext));
+ Console.WriteLine(
+ $"State {(object)s.m_state} with {(object)yyname} \"{(object)((TOKEN)s.m_value).yytext}\"");
else
- Console.WriteLine(string.Format("State {0} with {1}", (object) s.m_state, (object) yyname));
+ Console.WriteLine($"State {(object)s.m_state} with {(object)yyname}");
}
ParserEntry entry;
if (s.m_value != null && s.m_value.Pass(this.m_symbols, s.m_state, out entry))
diff --git a/LibreMetaverse.LslTools/Tools/ParserReduce.cs b/LibreMetaverse.LslTools/Tools/ParserReduce.cs
index 321b6e5c..f3141a15 100644
--- a/LibreMetaverse.LslTools/Tools/ParserReduce.cs
+++ b/LibreMetaverse.LslTools/Tools/ParserReduce.cs
@@ -90,7 +90,7 @@ namespace LibreMetaverse.LslTools
{
if (this.m_prod == null)
return "?? null reduce";
- return string.Format("reduce {0}", (object) this.m_prod.m_pno);
+ return $"reduce {(object)this.m_prod.m_pno}";
}
}
diff --git a/LibreMetaverse.LslTools/Tools/ParserShift.cs b/LibreMetaverse.LslTools/Tools/ParserShift.cs
index c78b475c..783efa96 100644
--- a/LibreMetaverse.LslTools/Tools/ParserShift.cs
+++ b/LibreMetaverse.LslTools/Tools/ParserShift.cs
@@ -61,7 +61,7 @@ namespace LibreMetaverse.LslTools
{
if (this.m_next == null)
return "?? null shift";
- return string.Format("shift {0}", (object) this.m_next.m_state);
+ return $"shift {(object)this.m_next.m_state}";
}
}
diff --git a/LibreMetaverse.LslTools/Tools/Production.cs b/LibreMetaverse.LslTools/Tools/Production.cs
index 022f0265..083e79fb 100644
--- a/LibreMetaverse.LslTools/Tools/Production.cs
+++ b/LibreMetaverse.LslTools/Tools/Production.cs
@@ -99,7 +99,7 @@ namespace LibreMetaverse.LslTools
{
int num = this.m_rhs.Count + 1;
CSymbol rh = (CSymbol) this.m_rhs[ix - 1];
- str += string.Format("\n\t(({0})(yyq.StackAt({1}).m_value))\n\t", (object) rh.TypeStr(), (object) (num - ix - 1));
+ str += $"\n\t(({(object)rh.TypeStr()})(yyq.StackAt({(object)(num - ix - 1)}).m_value))\n\t";
}
public static object Serialise(object o, Serialiser s)
diff --git a/LibreMetaverse.LslTools/Tools/SYMBOL.cs b/LibreMetaverse.LslTools/Tools/SYMBOL.cs
index aafee491..0dacb241 100644
--- a/LibreMetaverse.LslTools/Tools/SYMBOL.cs
+++ b/LibreMetaverse.LslTools/Tools/SYMBOL.cs
@@ -95,7 +95,7 @@ namespace LibreMetaverse.LslTools
ParsingInfo parsingInfo = (ParsingInfo) syms.symbolInfo[(object) this.yynum];
if (parsingInfo == null)
{
- string s = string.Format("No parsinginfo for symbol {0} {1}", (object) this.yyname, (object) this.yynum);
+ string s = $"No parsinginfo for symbol {(object)this.yyname} {(object)this.yynum}";
syms.erh.Error((CSToolsException) new CSToolsFatalException(9, this.yylx, this.yyname, s));
}
bool flag = parsingInfo.m_parsetable.Contains((object) snum);
diff --git a/LibreMetaverse.LslTools/Tools/Sfactory.cs b/LibreMetaverse.LslTools/Tools/Sfactory.cs
index 3e8c3747..0ec307ce 100644
--- a/LibreMetaverse.LslTools/Tools/Sfactory.cs
+++ b/LibreMetaverse.LslTools/Tools/Sfactory.cs
@@ -50,7 +50,8 @@ namespace LibreMetaverse.LslTools
}
catch (Exception ex)
{
- yyp.m_symbols.erh.Error(new CSToolsException(17, yyp.m_lexer, string.Format("Create of {0} failed ({1})", (object) cls_name, (object) ex.Message)));
+ yyp.m_symbols.erh.Error(new CSToolsException(17, yyp.m_lexer,
+ $"Create of {(object)cls_name} failed ({(object)ex.Message})"));
}
int length = cls_name.LastIndexOf('_');
if (length > 0)
diff --git a/LibreMetaverse.LslTools/Tools/TOKEN.cs b/LibreMetaverse.LslTools/Tools/TOKEN.cs
index d4fed8b7..b4e98803 100644
--- a/LibreMetaverse.LslTools/Tools/TOKEN.cs
+++ b/LibreMetaverse.LslTools/Tools/TOKEN.cs
@@ -78,7 +78,7 @@ namespace LibreMetaverse.LslTools
ParsingInfo parsingInfo = (ParsingInfo) syms.symbolInfo[(object) this.yynum];
if (parsingInfo == null)
{
- string s = string.Format("Parser does not recognise literal {0}", (object) this.yytext);
+ string s = $"Parser does not recognise literal {(object)this.yytext}";
syms.erh.Error((CSToolsException) new CSToolsFatalException(9, this.yylx, this.yyname, s));
}
bool flag = parsingInfo.m_parsetable.Contains((object) snum);
diff --git a/LibreMetaverse.LslTools/Tools/Tfactory.cs b/LibreMetaverse.LslTools/Tools/Tfactory.cs
index bc0cbca9..c73dd9e3 100644
--- a/LibreMetaverse.LslTools/Tools/Tfactory.cs
+++ b/LibreMetaverse.LslTools/Tools/Tfactory.cs
@@ -39,7 +39,7 @@ namespace LibreMetaverse.LslTools
{
TCreator type1 = (TCreator) yyl.tokens.types[(object) cls_name];
if (type1 == null)
- yyl.tokens.erh.Error(new CSToolsException(6, yyl, cls_name, string.Format("no factory for {0}", (object) cls_name)));
+ yyl.tokens.erh.Error(new CSToolsException(6, yyl, cls_name, $"no factory for {(object)cls_name}"));
try
{
return type1(yyl);
@@ -50,7 +50,8 @@ namespace LibreMetaverse.LslTools
}
catch (Exception ex)
{
- yyl.tokens.erh.Error(new CSToolsException(7, yyl, cls_name, string.Format("Line {0}: Create of {1} failed ({2})", (object) yyl.Saypos(yyl.m_pch), (object) cls_name, (object) ex.Message)));
+ yyl.tokens.erh.Error(new CSToolsException(7, yyl, cls_name,
+ $"Line {(object)yyl.Saypos(yyl.m_pch)}: Create of {(object)cls_name} failed ({(object)ex.Message})"));
}
int length = cls_name.LastIndexOf('_');
if (length > 0)
diff --git a/LibreMetaverse.LslTools/Tools/Transition.cs b/LibreMetaverse.LslTools/Tools/Transition.cs
index 5db21f44..b6b1660e 100644
--- a/LibreMetaverse.LslTools/Tools/Transition.cs
+++ b/LibreMetaverse.LslTools/Tools/Transition.cs
@@ -157,7 +157,9 @@ namespace LibreMetaverse.LslTools
if ((!t.m_ps.m_sgen.m_lalrParser ? (parserReduce2.m_prod.m_lhs.m_follow.Contains(t.m_A) ? 1 : 0) : (parserReduce2.m_lookAhead.Contains(t.m_A) ? 1 : 0)) != 0)
{
if (parserReduce1 != null)
- symbols.erh.Error(new CSToolsException(12, string.Format("reduce/reduce conflict {0} vs {1}", (object) parserReduce1.m_prod.m_pno, (object) parserReduce2.m_prod.m_pno) + string.Format(" state {0} on {1}", (object) t.m_ps.m_state, (object) t.m_A.yytext)));
+ symbols.erh.Error(new CSToolsException(12,
+ $"reduce/reduce conflict {(object)parserReduce1.m_prod.m_pno} vs {(object)parserReduce2.m_prod.m_pno}" +
+ $" state {(object)t.m_ps.m_state} on {(object)t.m_A.yytext}"));
parserReduce1 = parserReduce2;
}
}
diff --git a/LibreMetaverse.LslTools/Tools/UArc.cs b/LibreMetaverse.LslTools/Tools/UArc.cs
index 35c8cc0e..6b5383fb 100644
--- a/LibreMetaverse.LslTools/Tools/UArc.cs
+++ b/LibreMetaverse.LslTools/Tools/UArc.cs
@@ -46,7 +46,7 @@ namespace LibreMetaverse.LslTools
public override void Print(TextWriter s)
{
- s.WriteLine(string.Format(" U'{0}' {1}", (object) this.m_ch, (object) this.m_next.m_state));
+ s.WriteLine($" U'{(object)this.m_ch}' {(object)this.m_next.m_state}");
}
}
}
diff --git a/LibreMetaverse.StructuredData/JSON/JsonMapper.cs b/LibreMetaverse.StructuredData/JSON/JsonMapper.cs
index fc41c49c..f374f715 100644
--- a/LibreMetaverse.StructuredData/JSON/JsonMapper.cs
+++ b/LibreMetaverse.StructuredData/JSON/JsonMapper.cs
@@ -296,9 +296,7 @@ namespace LitJson
if (reader.Token == JsonToken.Null) {
if (! inst_type.IsClass)
- throw new JsonException (String.Format (
- "Can't assign null to an instance of type {0}",
- inst_type));
+ throw new JsonException ($"Can't assign null to an instance of type {inst_type}");
return null;
}
@@ -361,9 +359,7 @@ namespace LitJson
ArrayMetadata t_data = array_metadata[inst_type];
if (! t_data.IsArray && ! t_data.IsList)
- throw new JsonException (String.Format (
- "Type {0} can't act as an array",
- inst_type));
+ throw new JsonException ($"Type {inst_type} can't act as an array");
IList list;
Type elem_type;
@@ -430,9 +426,8 @@ namespace LitJson
} else {
if (! t_data.IsDictionary)
- throw new JsonException (String.Format (
- "The type {0} doesn't have the " +
- "property '{1}'", inst_type, property));
+ throw new JsonException ($"The type {inst_type} doesn't have the " +
+ $"property '{property}'");
((IDictionary) instance).Add (
property, ReadValue (
@@ -620,9 +615,7 @@ namespace LitJson
{
if (depth > max_nesting_depth)
throw new JsonException (
- String.Format ("Max allowed object depth reached while " +
- "trying to export from type {0}",
- obj.GetType ()));
+ "Max allowed object depth reached while " + $"trying to export from type {obj.GetType()}");
if (obj == null) {
writer.Write (null);
diff --git a/LibreMetaverse.Tests/TypeTests.cs b/LibreMetaverse.Tests/TypeTests.cs
index af56b7d4..6e34bbe3 100644
--- a/LibreMetaverse.Tests/TypeTests.cs
+++ b/LibreMetaverse.Tests/TypeTests.cs
@@ -135,26 +135,20 @@ namespace LibreMetaverse.Tests
}
else
{
- Assert.IsFalse(a == b, string.Format(
- "Vector casting failed, precision loss should" +
- " have occurred. " +
- "{0}: {1}, {2}", kvp.Key, a.X, b.X));
- Assert.IsFalse(b == d, string.Format(
- "Vector casting failed, explicit cast of double" +
- " to float should result in precision loss" +
- " whichwas should not magically disappear when" +
- " Vector3 is implicitly cast to Vector3d." +
- " {0}: {1}, {2}", kvp.Key, b.X, d.X));
+ Assert.IsFalse(a == b,
+ "Vector casting failed, precision loss should" + " have occurred. " +
+ $"{kvp.Key}: {a.X}, {b.X}");
+ Assert.IsFalse(b == d,
+ "Vector casting failed, explicit cast of double" + " to float should result in precision loss" +
+ " whichwas should not magically disappear when" + " Vector3 is implicitly cast to Vector3d." +
+ $" {kvp.Key}: {b.X}, {d.X}");
}
- Assert.IsTrue(a == c, string.Format(
- "Vector casting failed, Vector3 compared to" +
- " explicit cast of Vector3d to Vector3 should" +
- " result in identical precision loss." +
- " {0}: {1}, {2}", kvp.Key, a.X, c.X));
- Assert.IsTrue(a == d, string.Format(
- "Vector casting failed, implicit cast of Vector3" +
- " to Vector3d should not result in precision loss." +
- " {0}: {1}, {2}", kvp.Key, a.X, d.X));
+ Assert.IsTrue(a == c,
+ "Vector casting failed, Vector3 compared to" + " explicit cast of Vector3d to Vector3 should" +
+ " result in identical precision loss." + $" {kvp.Key}: {a.X}, {c.X}");
+ Assert.IsTrue(a == d,
+ "Vector casting failed, implicit cast of Vector3" +
+ " to Vector3d should not result in precision loss." + $" {kvp.Key}: {a.X}, {d.X}");
}
}
diff --git a/LibreMetaverse.Types/CacheDictionary.cs b/LibreMetaverse.Types/CacheDictionary.cs
index 364d9c4b..014eef70 100644
--- a/LibreMetaverse.Types/CacheDictionary.cs
+++ b/LibreMetaverse.Types/CacheDictionary.cs
@@ -98,7 +98,8 @@ namespace LibreMetaverse
if (_data.ContainsKey(keyToRemove))
_data.Remove(keyToRemove);
else
- throw new Exception(String.Format("Could not find a valid key to remove from cache, key = {0}", key == null ? "null" : key.ToString()));
+ throw new Exception(
+ $"Could not find a valid key to remove from cache, key = {(key == null ? "null" : key.ToString())}");
}
_data.Add(key, value);
_removalStrategy.KeyAdded(key);
diff --git a/LibreMetaverse.Types/Quaternion.cs b/LibreMetaverse.Types/Quaternion.cs
index b3005a60..e6a07050 100644
--- a/LibreMetaverse.Types/Quaternion.cs
+++ b/LibreMetaverse.Types/Quaternion.cs
@@ -247,8 +247,7 @@ namespace OpenMetaverse
}
else
{
- throw new InvalidOperationException(String.Format(
- "Quaternion {0} normalized to zero", ToString()));
+ throw new InvalidOperationException($"Quaternion {ToString()} normalized to zero");
}
}
diff --git a/LibreMetaverse.Voice/VoiceGateway.cs b/LibreMetaverse.Voice/VoiceGateway.cs
index 8e5f2a19..c5260e1d 100644
--- a/LibreMetaverse.Voice/VoiceGateway.cs
+++ b/LibreMetaverse.Voice/VoiceGateway.cs
@@ -272,7 +272,7 @@ namespace LibreMetaverse.Voice
public static string MakeXML(string name, string text)
{
return string.IsNullOrEmpty(text)
- ? string.Format("<{0} />", name)
+ ? $"<{name} />"
: string.Format("<{0}>{1}", name, text);
}
diff --git a/LibreMetaverse/AssetCache.cs b/LibreMetaverse/AssetCache.cs
index 731aebf7..c706c273 100644
--- a/LibreMetaverse/AssetCache.cs
+++ b/LibreMetaverse/AssetCache.cs
@@ -406,11 +406,11 @@ namespace OpenMetaverse
{
string size = "0 Bytes";
if (byteCount >= 1073741824)
- size = String.Format("{0:##.##}", byteCount / 1073741824) + " GB";
+ size = $"{byteCount / 1073741824:##.##}" + " GB";
else if (byteCount >= 1048576)
- size = String.Format("{0:##.##}", byteCount / 1048576) + " MB";
+ size = $"{byteCount / 1048576:##.##}" + " MB";
else if (byteCount >= 1024)
- size = String.Format("{0:##.##}", byteCount / 1024) + " KB";
+ size = $"{byteCount / 1024:##.##}" + " KB";
else if (byteCount > 0 && byteCount < 1024)
size = byteCount + " Bytes";
diff --git a/LibreMetaverse/Assets/Archiving/OarFile.cs b/LibreMetaverse/Assets/Archiving/OarFile.cs
index fc8d57fc..7f710571 100644
--- a/LibreMetaverse/Assets/Archiving/OarFile.cs
+++ b/LibreMetaverse/Assets/Archiving/OarFile.cs
@@ -102,7 +102,7 @@ namespace OpenMetaverse.Assets
}
if (failedAssetRestores > 0)
- Logger.Log(String.Format("[OarFile]: Failed to load {0} assets", failedAssetRestores), Helpers.LogLevel.Warning);
+ Logger.Log($"[OarFile]: Failed to load {failedAssetRestores} assets", Helpers.LogLevel.Warning);
}
private static bool LoadAsset(string assetPath, byte[] data, AssetLoadedCallback assetCallback, long bytesRead, long totalBytes)
diff --git a/LibreMetaverse/Imaging/BakeLayer.cs b/LibreMetaverse/Imaging/BakeLayer.cs
index fc7d1bf3..d71f9e26 100644
--- a/LibreMetaverse/Imaging/BakeLayer.cs
+++ b/LibreMetaverse/Imaging/BakeLayer.cs
@@ -369,7 +369,7 @@ namespace OpenMetaverse.Imaging
}
if (bitmap == null)
{
- Logger.Log(String.Format("Failed loading resource file: {0}", fileName), Helpers.LogLevel.Error);
+ Logger.Log($"Failed loading resource file: {fileName}", Helpers.LogLevel.Error);
return null;
}
else
@@ -379,7 +379,7 @@ namespace OpenMetaverse.Imaging
}
catch (Exception e)
{
- Logger.Log(String.Format("Failed loading resource file: {0} ({1})", fileName, e.Message),
+ Logger.Log($"Failed loading resource file: {fileName} ({e.Message})",
Helpers.LogLevel.Error, e);
return null;
}
diff --git a/LibreMetaverse/ParcelManager.cs b/LibreMetaverse/ParcelManager.cs
index 5881c66f..f8290662 100644
--- a/LibreMetaverse/ParcelManager.cs
+++ b/LibreMetaverse/ParcelManager.cs
@@ -1428,7 +1428,8 @@ namespace OpenMetaverse
}
else
{
- Logger.Log(String.Format("ParcelMap returned an default/invalid value for location {0}/{1} Did you use RequestAllSimParcels() to populate the dictionaries?", (byte)position.Y / 4, (byte)position.X / 4 ), Helpers.LogLevel.Warning);
+ Logger.Log(
+ $"ParcelMap returned an default/invalid value for location {(byte)position.Y / 4}/{(byte)position.X / 4} Did you use RequestAllSimParcels() to populate the dictionaries?", Helpers.LogLevel.Warning);
return 0;
}
}
@@ -1497,7 +1498,7 @@ namespace OpenMetaverse
Parcel p;
if (!simulator.Parcels.TryGetValue(localID, out p))
{
- Logger.Log(String.Format("Can't find parcel {0} in simulator {1}", localID, simulator),
+ Logger.Log($"Can't find parcel {localID} in simulator {simulator}",
Helpers.LogLevel.Warning, Client);
return false;
}
diff --git a/LibreMetaverse/Primitives/Primitive.cs b/LibreMetaverse/Primitives/Primitive.cs
index 6b1ef22e..28ce1525 100644
--- a/LibreMetaverse/Primitives/Primitive.cs
+++ b/LibreMetaverse/Primitives/Primitive.cs
@@ -519,7 +519,7 @@ namespace OpenMetaverse
///
public override string ToString()
{
- return String.Format("LightTexture: {0} Params; {1}", LightTexture, Params);
+ return $"LightTexture: {LightTexture} Params; {Params}";
}
}
@@ -1328,9 +1328,9 @@ namespace OpenMetaverse
switch (PrimData.PCode)
{
case PCode.Prim:
- return String.Format("{0} ({1})", Type, ID);
+ return $"{Type} ({ID})";
default:
- return String.Format("{0} ({1})", PrimData.PCode, ID);
+ return $"{PrimData.PCode} ({ID})";
}
}
diff --git a/LibreMetaverse/Rendering/LindenMesh.cs b/LibreMetaverse/Rendering/LindenMesh.cs
index ff38f4d0..17c72e1c 100644
--- a/LibreMetaverse/Rendering/LindenMesh.cs
+++ b/LibreMetaverse/Rendering/LindenMesh.cs
@@ -90,7 +90,8 @@ namespace OpenMetaverse.Rendering
/// Vertex definition as a string
public override string ToString()
{
- return String.Format("Coord: {0} Norm: {1} BiNorm: {2} TexCoord: {3} DetailTexCoord: {4}", Coord, Normal, BiNormal, TexCoord, DetailTexCoord);
+ return
+ $"Coord: {Coord} Norm: {Normal} BiNorm: {BiNormal} TexCoord: {TexCoord} DetailTexCoord: {DetailTexCoord}";
}
}
@@ -111,7 +112,7 @@ namespace OpenMetaverse.Rendering
/// MorphVertex definition as a string
public override string ToString()
{
- return String.Format("Index: {0} Coord: {1} Norm: {2} BiNorm: {3} TexCoord: {4}", VertexIndex, Coord, Normal, BiNormal, TexCoord);
+ return $"Index: {VertexIndex} Coord: {Coord} Norm: {Normal} BiNorm: {BiNormal} TexCoord: {TexCoord}";
}
}
@@ -148,7 +149,7 @@ namespace OpenMetaverse.Rendering
/// Human friendly format
public override string ToString()
{
- return String.Format("{0} -> {1}", RemapSource, RemapDestination);
+ return $"{RemapSource} -> {RemapDestination}";
}
}
#endregion Mesh Structs
diff --git a/LibreMetaverse/Rendering/Rendering.cs b/LibreMetaverse/Rendering/Rendering.cs
index e7f1e590..410be06e 100644
--- a/LibreMetaverse/Rendering/Rendering.cs
+++ b/LibreMetaverse/Rendering/Rendering.cs
@@ -91,7 +91,7 @@ namespace OpenMetaverse.Rendering
public override string ToString()
{
- return String.Format("P: {0} N: {1} T: {2}", Position, Normal, TexCoord);
+ return $"P: {Position} N: {Normal} T: {TexCoord}";
}
public override int GetHashCode()
diff --git a/LibreMetaverse/Simulator.cs b/LibreMetaverse/Simulator.cs
index 2f82738c..b0fcfb58 100644
--- a/LibreMetaverse/Simulator.cs
+++ b/LibreMetaverse/Simulator.cs
@@ -1086,8 +1086,8 @@ namespace OpenMetaverse
}
catch (MalformedDataException)
{
- Logger.Log(String.Format("Malformed data, cannot parse packet:\n{0}",
- Utils.BytesToHexString(buffer.Data, buffer.DataLength, null)), Helpers.LogLevel.Error);
+ Logger.Log(
+ $"Malformed data, cannot parse packet:\n{Utils.BytesToHexString(buffer.Data, buffer.DataLength, null)}", Helpers.LogLevel.Error);
}
// Fail-safe check
diff --git a/Programs/GridProxy/GridProxy.cs b/Programs/GridProxy/GridProxy.cs
index 41e7cf9f..192615bc 100644
--- a/Programs/GridProxy/GridProxy.cs
+++ b/Programs/GridProxy/GridProxy.cs
@@ -529,7 +529,7 @@ namespace GridProxy
meth = match.Groups[1].Captures[0].ToString();
uri = match.Groups[2].Captures[0].ToString();
- OpenMetaverse.Logger.Log(String.Format("[{0}] {1}:{2}", reqNo, meth, uri), Helpers.LogLevel.Debug);
+ OpenMetaverse.Logger.Log($"[{reqNo}] {meth}:{uri}", Helpers.LogLevel.Debug);
// read HTTP header
do
@@ -547,7 +547,7 @@ namespace GridProxy
if (!match.Success)
{
- OpenMetaverse.Logger.Log(String.Format("[{0}] Bad Header: '{1}'", reqNo, line), Helpers.LogLevel.Warning);
+ OpenMetaverse.Logger.Log($"[{reqNo}] Bad Header: '{line}'", Helpers.LogLevel.Warning);
byte[] wr = Encoding.ASCII.GetBytes("HTTP/1.0 400 Bad Request\r\nContent-Length: 0\r\n\r\n");
netStream.Write(wr, 0, wr.Length);
netStream.Close(); client.Close();
@@ -574,7 +574,7 @@ namespace GridProxy
reader.Read(content, 0, contentLength);
if (contentLength < 8192)
- OpenMetaverse.Logger.Log(String.Format("[{0}] request length={1}:\n{2}", reqNo, contentLength, Utils.BytesToString(content)), Helpers.LogLevel.Debug);
+ OpenMetaverse.Logger.Log($"[{reqNo}] request length={contentLength}:\n{Utils.BytesToString(content)}", Helpers.LogLevel.Debug);
if (uri == "/")
{
@@ -748,7 +748,7 @@ namespace GridProxy
}
else if (cap == null)
{
- OpenMetaverse.Logger.Log(string.Format("{0} {1}", req.Method, req.Address), Helpers.LogLevel.Info);
+ OpenMetaverse.Logger.Log($"{req.Method} {req.Address}", Helpers.LogLevel.Info);
}
resp = (HttpWebResponse)req.GetResponse();
}
diff --git a/Programs/examples/PacketDump/PacketDump.cs b/Programs/examples/PacketDump/PacketDump.cs
index 204c45d8..35d434d1 100644
--- a/Programs/examples/PacketDump/PacketDump.cs
+++ b/Programs/examples/PacketDump/PacketDump.cs
@@ -107,7 +107,7 @@ namespace PacketDump
static void LoginHandler(object sender, LoginProgressEventArgs e)
{
- Logger.Log(String.Format("Login: {0} ({1})", e.Status, e.Message), Helpers.LogLevel.Info);
+ Logger.Log($"Login: {e.Status} ({e.Message})", Helpers.LogLevel.Info);
switch (e.Status)
{