From 2f6a5f55753aac5f9718dddf39e2c73560c9e9c3 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 27 Jun 2008 18:32:32 +0000 Subject: dr scofield's continuing warnings safari: * code caught lingering around with no real purpose other than causing warnings will be taken down. --- .../Region/Communications/OGS1/OGS1GridServices.cs | 33 +++++++++++----------- .../Modules/Avatar/Friends/FriendsModule.cs | 2 +- .../Avatar/InstantMessage/InstantMessageModule.cs | 3 +- 3 files changed, 20 insertions(+), 18 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index f7de887..2192d12 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -52,7 +52,7 @@ namespace OpenSim.Region.Communications.OGS1 private LocalBackEndServices m_localBackend = new LocalBackEndServices(); private Dictionary m_remoteRegionInfoCache = new Dictionary(); - private List m_knownRegions = new List(); + // private List m_knownRegions = new List(); private Dictionary m_deadRegionCache = new Dictionary(); private Dictionary m_queuedGridSettings = new Dictionary(); private List m_regionsOnInstance = new List(); @@ -158,7 +158,7 @@ namespace OpenSim.Region.Communications.OGS1 } Hashtable GridRespData = (Hashtable)GridResp.Value; - Hashtable griddatahash = GridRespData; + // Hashtable griddatahash = GridRespData; // Process Response if (GridRespData.ContainsKey("error")) @@ -171,7 +171,7 @@ namespace OpenSim.Region.Communications.OGS1 } else { - m_knownRegions = RequestNeighbours(regionInfo.RegionLocX, regionInfo.RegionLocY); + // m_knownRegions = RequestNeighbours(regionInfo.RegionLocX, regionInfo.RegionLocY); if (GridRespData.ContainsKey("allow_forceful_banlines")) { if ((string) GridRespData["allow_forceful_banlines"] != "TRUE") @@ -203,7 +203,7 @@ namespace OpenSim.Region.Communications.OGS1 XmlRpcResponse GridResp = GridReq.Send(serversInfo.GridURL, 10000); Hashtable GridRespData = (Hashtable) GridResp.Value; - Hashtable griddatahash = GridRespData; + // Hashtable griddatahash = GridRespData; // Process Response if (GridRespData.ContainsKey("error")) @@ -251,12 +251,13 @@ namespace OpenSim.Region.Communications.OGS1 string simIp = (string) neighbourData["sim_ip"]; uint port = Convert.ToUInt32(neighbourData["sim_port"]); - string externalUri = (string) neighbourData["sim_uri"]; + // string externalUri = (string) neighbourData["sim_uri"]; - string externalIpStr = String.Empty; + // string externalIpStr = String.Empty; try { - externalIpStr = Util.GetHostFromDNS(simIp).ToString(); + // externalIpStr = Util.GetHostFromDNS(simIp).ToString(); + Util.GetHostFromDNS(simIp).ToString(); } catch (SocketException e) { @@ -311,10 +312,10 @@ namespace OpenSim.Region.Communications.OGS1 uint regY = Convert.ToUInt32((string) responseData["region_locy"]); string internalIpStr = (string) responseData["sim_ip"]; uint port = Convert.ToUInt32(responseData["sim_port"]); - string externalUri = (string) responseData["sim_uri"]; + // string externalUri = (string) responseData["sim_uri"]; IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); - string neighbourExternalUri = externalUri; + // string neighbourExternalUri = externalUri; regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr); regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); @@ -374,10 +375,10 @@ namespace OpenSim.Region.Communications.OGS1 uint regY = Convert.ToUInt32((string) responseData["region_locy"]); string internalIpStr = (string) responseData["sim_ip"]; uint port = Convert.ToUInt32(responseData["sim_port"]); - string externalUri = (string) responseData["sim_uri"]; + // string externalUri = (string) responseData["sim_uri"]; IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); - string neighbourExternalUri = externalUri; + // string neighbourExternalUri = externalUri; regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr); regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); @@ -442,10 +443,10 @@ namespace OpenSim.Region.Communications.OGS1 uint regY = Convert.ToUInt32((string) responseData["region_locy"]); string internalIpStr = (string) responseData["sim_ip"]; uint port = Convert.ToUInt32(responseData["sim_port"]); - string externalUri = (string) responseData["sim_uri"]; + // string externalUri = (string) responseData["sim_uri"]; IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); - string neighbourExternalUri = externalUri; + // string neighbourExternalUri = externalUri; regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr); regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); @@ -1313,7 +1314,7 @@ namespace OpenSim.Region.Communications.OGS1 regInfo = RequestNeighbourInfo(regionHandle); if (regInfo != null) { - bool retValue = false; + // bool retValue = false; OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject( typeof(OGS1InterRegionRemoting), "tcp://" + regInfo.RemotingAddress + @@ -1322,8 +1323,8 @@ namespace OpenSim.Region.Communications.OGS1 if (remObject != null) { - retValue = - remObject.TellRegionToCloseChildConnection(regionHandle, agentID.UUID); + // retValue = + remObject.TellRegionToCloseChildConnection(regionHandle, agentID.UUID); } else { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs index 0762291..c5a4a96 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs @@ -376,7 +376,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends m_log.Info("[FRIEND]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + "."); if (avatar.JID.Length > 0) { - JId avatarID = new JId(avatar.JID); + // JId avatarID = new JId(avatar.JID); // REST Post XMPP Stanzas! } // Claim User! my user! Mine mine mine! diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs index 0944406..bb3303f 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs @@ -636,7 +636,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage } catch (WebException e) { - m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to {0} the host didn't respond", "http://" + reginfo.ExternalHostName + ":" + reginfo.HttpPort); + m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to http://{0}:{1} the host didn't respond ({2})", + reginfo.ExternalHostName, reginfo.HttpPort, e.Message); } return false; -- cgit v1.1