aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDr Scofield2008-06-27 18:32:32 +0000
committerDr Scofield2008-06-27 18:32:32 +0000
commit2f6a5f55753aac5f9718dddf39e2c73560c9e9c3 (patch)
tree723d95a1fd079b8fb870786d359e4a07aef92a60 /OpenSim
parent* fix a bug where I was assuming all entities would be SceneObjectGroups - of... (diff)
downloadopensim-SC_OLD-2f6a5f55753aac5f9718dddf39e2c73560c9e9c3.zip
opensim-SC_OLD-2f6a5f55753aac5f9718dddf39e2c73560c9e9c3.tar.gz
opensim-SC_OLD-2f6a5f55753aac5f9718dddf39e2c73560c9e9c3.tar.bz2
opensim-SC_OLD-2f6a5f55753aac5f9718dddf39e2c73560c9e9c3.tar.xz
dr scofield's continuing warnings safari:
* code caught lingering around with no real purpose other than causing warnings will be taken down.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs33
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs3
3 files changed, 20 insertions, 18 deletions
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
52 52
53 private LocalBackEndServices m_localBackend = new LocalBackEndServices(); 53 private LocalBackEndServices m_localBackend = new LocalBackEndServices();
54 private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>(); 54 private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
55 private List<SimpleRegionInfo> m_knownRegions = new List<SimpleRegionInfo>(); 55 // private List<SimpleRegionInfo> m_knownRegions = new List<SimpleRegionInfo>();
56 private Dictionary<ulong, int> m_deadRegionCache = new Dictionary<ulong, int>(); 56 private Dictionary<ulong, int> m_deadRegionCache = new Dictionary<ulong, int>();
57 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>(); 57 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
58 private List<RegionInfo> m_regionsOnInstance = new List<RegionInfo>(); 58 private List<RegionInfo> m_regionsOnInstance = new List<RegionInfo>();
@@ -158,7 +158,7 @@ namespace OpenSim.Region.Communications.OGS1
158 } 158 }
159 159
160 Hashtable GridRespData = (Hashtable)GridResp.Value; 160 Hashtable GridRespData = (Hashtable)GridResp.Value;
161 Hashtable griddatahash = GridRespData; 161 // Hashtable griddatahash = GridRespData;
162 162
163 // Process Response 163 // Process Response
164 if (GridRespData.ContainsKey("error")) 164 if (GridRespData.ContainsKey("error"))
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Communications.OGS1
171 } 171 }
172 else 172 else
173 { 173 {
174 m_knownRegions = RequestNeighbours(regionInfo.RegionLocX, regionInfo.RegionLocY); 174 // m_knownRegions = RequestNeighbours(regionInfo.RegionLocX, regionInfo.RegionLocY);
175 if (GridRespData.ContainsKey("allow_forceful_banlines")) 175 if (GridRespData.ContainsKey("allow_forceful_banlines"))
176 { 176 {
177 if ((string) GridRespData["allow_forceful_banlines"] != "TRUE") 177 if ((string) GridRespData["allow_forceful_banlines"] != "TRUE")
@@ -203,7 +203,7 @@ namespace OpenSim.Region.Communications.OGS1
203 XmlRpcResponse GridResp = GridReq.Send(serversInfo.GridURL, 10000); 203 XmlRpcResponse GridResp = GridReq.Send(serversInfo.GridURL, 10000);
204 Hashtable GridRespData = (Hashtable) GridResp.Value; 204 Hashtable GridRespData = (Hashtable) GridResp.Value;
205 205
206 Hashtable griddatahash = GridRespData; 206 // Hashtable griddatahash = GridRespData;
207 207
208 // Process Response 208 // Process Response
209 if (GridRespData.ContainsKey("error")) 209 if (GridRespData.ContainsKey("error"))
@@ -251,12 +251,13 @@ namespace OpenSim.Region.Communications.OGS1
251 string simIp = (string) neighbourData["sim_ip"]; 251 string simIp = (string) neighbourData["sim_ip"];
252 252
253 uint port = Convert.ToUInt32(neighbourData["sim_port"]); 253 uint port = Convert.ToUInt32(neighbourData["sim_port"]);
254 string externalUri = (string) neighbourData["sim_uri"]; 254 // string externalUri = (string) neighbourData["sim_uri"];
255 255
256 string externalIpStr = String.Empty; 256 // string externalIpStr = String.Empty;
257 try 257 try
258 { 258 {
259 externalIpStr = Util.GetHostFromDNS(simIp).ToString(); 259 // externalIpStr = Util.GetHostFromDNS(simIp).ToString();
260 Util.GetHostFromDNS(simIp).ToString();
260 } 261 }
261 catch (SocketException e) 262 catch (SocketException e)
262 { 263 {
@@ -311,10 +312,10 @@ namespace OpenSim.Region.Communications.OGS1
311 uint regY = Convert.ToUInt32((string) responseData["region_locy"]); 312 uint regY = Convert.ToUInt32((string) responseData["region_locy"]);
312 string internalIpStr = (string) responseData["sim_ip"]; 313 string internalIpStr = (string) responseData["sim_ip"];
313 uint port = Convert.ToUInt32(responseData["sim_port"]); 314 uint port = Convert.ToUInt32(responseData["sim_port"]);
314 string externalUri = (string) responseData["sim_uri"]; 315 // string externalUri = (string) responseData["sim_uri"];
315 316
316 IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); 317 IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
317 string neighbourExternalUri = externalUri; 318 // string neighbourExternalUri = externalUri;
318 regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr); 319 regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr);
319 320
320 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); 321 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
@@ -374,10 +375,10 @@ namespace OpenSim.Region.Communications.OGS1
374 uint regY = Convert.ToUInt32((string) responseData["region_locy"]); 375 uint regY = Convert.ToUInt32((string) responseData["region_locy"]);
375 string internalIpStr = (string) responseData["sim_ip"]; 376 string internalIpStr = (string) responseData["sim_ip"];
376 uint port = Convert.ToUInt32(responseData["sim_port"]); 377 uint port = Convert.ToUInt32(responseData["sim_port"]);
377 string externalUri = (string) responseData["sim_uri"]; 378 // string externalUri = (string) responseData["sim_uri"];
378 379
379 IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); 380 IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
380 string neighbourExternalUri = externalUri; 381 // string neighbourExternalUri = externalUri;
381 regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr); 382 regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr);
382 383
383 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); 384 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
@@ -442,10 +443,10 @@ namespace OpenSim.Region.Communications.OGS1
442 uint regY = Convert.ToUInt32((string) responseData["region_locy"]); 443 uint regY = Convert.ToUInt32((string) responseData["region_locy"]);
443 string internalIpStr = (string) responseData["sim_ip"]; 444 string internalIpStr = (string) responseData["sim_ip"];
444 uint port = Convert.ToUInt32(responseData["sim_port"]); 445 uint port = Convert.ToUInt32(responseData["sim_port"]);
445 string externalUri = (string) responseData["sim_uri"]; 446 // string externalUri = (string) responseData["sim_uri"];
446 447
447 IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); 448 IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
448 string neighbourExternalUri = externalUri; 449 // string neighbourExternalUri = externalUri;
449 regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr); 450 regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr);
450 451
451 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); 452 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
@@ -1313,7 +1314,7 @@ namespace OpenSim.Region.Communications.OGS1
1313 regInfo = RequestNeighbourInfo(regionHandle); 1314 regInfo = RequestNeighbourInfo(regionHandle);
1314 if (regInfo != null) 1315 if (regInfo != null)
1315 { 1316 {
1316 bool retValue = false; 1317 // bool retValue = false;
1317 OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject( 1318 OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject(
1318 typeof(OGS1InterRegionRemoting), 1319 typeof(OGS1InterRegionRemoting),
1319 "tcp://" + regInfo.RemotingAddress + 1320 "tcp://" + regInfo.RemotingAddress +
@@ -1322,8 +1323,8 @@ namespace OpenSim.Region.Communications.OGS1
1322 1323
1323 if (remObject != null) 1324 if (remObject != null)
1324 { 1325 {
1325 retValue = 1326 // retValue =
1326 remObject.TellRegionToCloseChildConnection(regionHandle, agentID.UUID); 1327 remObject.TellRegionToCloseChildConnection(regionHandle, agentID.UUID);
1327 } 1328 }
1328 else 1329 else
1329 { 1330 {
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
376 m_log.Info("[FRIEND]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + "."); 376 m_log.Info("[FRIEND]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + ".");
377 if (avatar.JID.Length > 0) 377 if (avatar.JID.Length > 0)
378 { 378 {
379 JId avatarID = new JId(avatar.JID); 379 // JId avatarID = new JId(avatar.JID);
380 // REST Post XMPP Stanzas! 380 // REST Post XMPP Stanzas!
381 } 381 }
382 // Claim User! my user! Mine mine mine! 382 // 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
636 } 636 }
637 catch (WebException e) 637 catch (WebException e)
638 { 638 {
639 m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to {0} the host didn't respond", "http://" + reginfo.ExternalHostName + ":" + reginfo.HttpPort); 639 m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to http://{0}:{1} the host didn't respond ({2})",
640 reginfo.ExternalHostName, reginfo.HttpPort, e.Message);
640 } 641 }
641 642
642 return false; 643 return false;