From 803670e6eaaeafa1b7f90b6a7a9f461bd459634a Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Fri, 21 Mar 2008 02:36:34 +0000
Subject: * Removed more encoding faults.

---
 OpenSim/Region/Environment/EstateManager.cs           | 5 +----
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index 9c53f38..f097b61 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -634,9 +634,6 @@ namespace OpenSim.Region.Environment
 
         public void sendRegionInfoPacket(IClientAPI remote_client)
         {
-            // ENCODING FAULT
-            Encoding _enc = Encoding.UTF8;
-
             AgentCircuitData circuitData = remote_client.RequestClientInfo();
 
             RegionInfoPacket regionInfoPacket = new RegionInfoPacket();
@@ -652,7 +649,7 @@ namespace OpenSim.Region.Environment
             regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.EstateSettings.redirectGridY;
             regionInfoPacket.RegionInfo.RegionFlags = (uint) m_regInfo.EstateSettings.regionFlags;
             regionInfoPacket.RegionInfo.SimAccess = (byte) m_regInfo.EstateSettings.simAccess;
-            regionInfoPacket.RegionInfo.SimName = _enc.GetBytes(m_regInfo.RegionName);
+            regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_regInfo.RegionName);
             regionInfoPacket.RegionInfo.SunHour = m_regInfo.EstateSettings.sunHour;
             regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.EstateSettings.terrainLowerLimit;
             regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.EstateSettings.terrainRaiseLimit;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index b0ed04e..c83027d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -45,9 +45,6 @@ namespace OpenSim.Region.Environment.Scenes
 
     public partial class SceneObjectGroup : EntityBase
     {
-        // ENCODING FAULT
-        private Encoding enc = Encoding.UTF8;
-
         protected SceneObjectPart m_rootPart;
         
         /// <summary>
-- 
cgit v1.1