diff options
author | Adam Frisby | 2007-07-19 00:25:40 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-19 00:25:40 +0000 |
commit | 6cf9d6da213c048c69b9ab2104086e7e06674fb9 (patch) | |
tree | 985fa00ce46c6cb17cea6956bf830b34c70091d8 /OpenSim | |
parent | * Removing more compiler warnings. (diff) | |
download | opensim-SC-6cf9d6da213c048c69b9ab2104086e7e06674fb9.zip opensim-SC-6cf9d6da213c048c69b9ab2104086e7e06674fb9.tar.gz opensim-SC-6cf9d6da213c048c69b9ab2104086e7e06674fb9.tar.bz2 opensim-SC-6cf9d6da213c048c69b9ab2104086e7e06674fb9.tar.xz |
* Removing more compiler warnings
Diffstat (limited to '')
4 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 317a0ba..9a9efec 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
117 | uint regY = Convert.ToUInt32(n["y"]); | 117 | uint regY = Convert.ToUInt32(n["y"]); |
118 | if ((regionInfo.RegionLocX != regX) || (regionInfo.RegionLocY != regY)) | 118 | if ((regionInfo.RegionLocX != regX) || (regionInfo.RegionLocY != regY)) |
119 | { | 119 | { |
120 | string externalIpStr = Dns.GetHostByName((string)n["sim_ip"]).AddressList[0].ToString(); | 120 | string externalIpStr = OpenSim.Framework.Utilities.Util.GetHostFromDNS((string)n["sim_ip"]).ToString(); |
121 | uint port = Convert.ToUInt32(n["sim_port"]); | 121 | uint port = Convert.ToUInt32(n["sim_port"]); |
122 | string externalUri = (string)n["sim_uri"]; | 122 | string externalUri = (string)n["sim_uri"]; |
123 | 123 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs index 7484393..67ba500 100644 --- a/OpenSim/Region/Environment/Scenes/Primitive.cs +++ b/OpenSim/Region/Environment/Scenes/Primitive.cs | |||
@@ -44,8 +44,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
44 | public bool m_isRootPrim; | 44 | public bool m_isRootPrim; |
45 | public EntityBase m_Parent; | 45 | public EntityBase m_Parent; |
46 | 46 | ||
47 | private EventManager m_eventManager; | ||
48 | |||
49 | public event PrimCountTaintedDelegate OnPrimCountTainted; | 47 | public event PrimCountTaintedDelegate OnPrimCountTainted; |
50 | 48 | ||
51 | #region Properties | 49 | #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 3b0a1ff..4b8f8d7 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; | |||
343 | 343 | ||
344 | Common.SendToDebug("Last OPCODE was return command. Code chunk execution complete."); | 344 | Common.SendToDebug("Last OPCODE was return command. Code chunk execution complete."); |
345 | return true; | 345 | return true; |
346 | break; | ||
347 | } | 346 | } |
348 | return false; | 347 | return false; |
349 | } | 348 | } |
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs index 86cf410..831c165 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 | |||
73 | [Obsolete("Unimplemented")] | 73 | [Obsolete("Unimplemented")] |
74 | public void osAddToLandPassList(Key avatar, float hours) | 74 | public void osAddToLandPassList(Key avatar, float hours) |
75 | { | 75 | { |
76 | int parcelID = 0; | ||
77 | |||
78 | Vector myPosition = Task.Pos; | 76 | Vector myPosition = Task.Pos; |
79 | Land myParcel = World.LandManager.getLandObject(myPosition.X, myPosition.Y); | 77 | Land myParcel = World.LandManager.getLandObject(myPosition.X, myPosition.Y); |
80 | 78 | ||