From 884d603cac6c3fe0cdbd199e13e1514146ff82bc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 13 Jul 2012 01:03:28 +0100
Subject: Rather than instantiating a UTF8 encoding everywhere when we want to
 supress the BOM, use a single Util.UTF8NoBomEncoding.

This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
---
 .../CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs  | 2 +-
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 01be339..3c6e381 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -150,7 +150,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             if (!m_Enabled)
                 return;
-            
+
             m_LocalCache[scene.RegionInfo.RegionID].Clear();
             m_LocalCache.Remove(scene.RegionInfo.RegionID);
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 1c0cac7..f1abd4b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -952,7 +952,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 try
                 {
                     FileStream fs = File.Create(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state"));
-                    Byte[] buf = (new UTF8Encoding()).GetBytes(xml);
+                    Byte[] buf = Util.UTF8NoBomEncoding.GetBytes(xml);
                     fs.Write(buf, 0, buf.Length);
                     fs.Close();
                 }
-- 
cgit v1.1