aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs3
2 files changed, 1 insertions, 7 deletions
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
634 634
635 public void sendRegionInfoPacket(IClientAPI remote_client) 635 public void sendRegionInfoPacket(IClientAPI remote_client)
636 { 636 {
637 // ENCODING FAULT
638 Encoding _enc = Encoding.UTF8;
639
640 AgentCircuitData circuitData = remote_client.RequestClientInfo(); 637 AgentCircuitData circuitData = remote_client.RequestClientInfo();
641 638
642 RegionInfoPacket regionInfoPacket = new RegionInfoPacket(); 639 RegionInfoPacket regionInfoPacket = new RegionInfoPacket();
@@ -652,7 +649,7 @@ namespace OpenSim.Region.Environment
652 regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.EstateSettings.redirectGridY; 649 regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.EstateSettings.redirectGridY;
653 regionInfoPacket.RegionInfo.RegionFlags = (uint) m_regInfo.EstateSettings.regionFlags; 650 regionInfoPacket.RegionInfo.RegionFlags = (uint) m_regInfo.EstateSettings.regionFlags;
654 regionInfoPacket.RegionInfo.SimAccess = (byte) m_regInfo.EstateSettings.simAccess; 651 regionInfoPacket.RegionInfo.SimAccess = (byte) m_regInfo.EstateSettings.simAccess;
655 regionInfoPacket.RegionInfo.SimName = _enc.GetBytes(m_regInfo.RegionName); 652 regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_regInfo.RegionName);
656 regionInfoPacket.RegionInfo.SunHour = m_regInfo.EstateSettings.sunHour; 653 regionInfoPacket.RegionInfo.SunHour = m_regInfo.EstateSettings.sunHour;
657 regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.EstateSettings.terrainLowerLimit; 654 regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.EstateSettings.terrainLowerLimit;
658 regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.EstateSettings.terrainRaiseLimit; 655 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
45 45
46 public partial class SceneObjectGroup : EntityBase 46 public partial class SceneObjectGroup : EntityBase
47 { 47 {
48 // ENCODING FAULT
49 private Encoding enc = Encoding.UTF8;
50
51 protected SceneObjectPart m_rootPart; 48 protected SceneObjectPart m_rootPart;
52 49
53 /// <summary> 50 /// <summary>