From 6cf9d6da213c048c69b9ab2104086e7e06674fb9 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Thu, 19 Jul 2007 00:25:40 +0000 Subject: [PATCH] * Removing more compiler warnings --- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 2 +- OpenSim/Region/Environment/Scenes/Primitive.cs | 2 -- .../Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs | 1 - .../Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 317a0ba8a8..9a9efec6af 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -117,7 +117,7 @@ namespace OpenSim.Region.Communications.OGS1 uint regY = Convert.ToUInt32(n["y"]); if ((regionInfo.RegionLocX != regX) || (regionInfo.RegionLocY != regY)) { - string externalIpStr = Dns.GetHostByName((string)n["sim_ip"]).AddressList[0].ToString(); + string externalIpStr = OpenSim.Framework.Utilities.Util.GetHostFromDNS((string)n["sim_ip"]).ToString(); uint port = Convert.ToUInt32(n["sim_port"]); string externalUri = (string)n["sim_uri"]; diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs index 7484393462..67ba500ddf 100644 --- a/OpenSim/Region/Environment/Scenes/Primitive.cs +++ b/OpenSim/Region/Environment/Scenes/Primitive.cs @@ -44,8 +44,6 @@ namespace OpenSim.Region.Environment.Scenes public bool m_isRootPrim; public EntityBase m_Parent; - private EventManager m_eventManager; - public event PrimCountTaintedDelegate OnPrimCountTainted; #region Properties diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs index 3b0a1ff138..4b8f8d75b8 100644 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs +++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs @@ -343,7 +343,6 @@ using System; Common.SendToDebug("Last OPCODE was return command. Code chunk execution complete."); return true; - break; } return false; } diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs index 86cf410d4c..831c165016 100644 --- a/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs +++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs @@ -73,8 +73,6 @@ namespace OpenSim.Region.Scripting [Obsolete("Unimplemented")] public void osAddToLandPassList(Key avatar, float hours) { - int parcelID = 0; - Vector myPosition = Task.Pos; Land myParcel = World.LandManager.getLandObject(myPosition.X, myPosition.Y);