OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor format changes and message additions

trunk
Justin Clarke Casey 2009-07-10 19:18:05 +00:00
parent d7d2de3a08
commit 18ffbf6342
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Framework/Communications/Clients/GridClient.cs
View File

@ -29,7 +29,9 @@ using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Reflection;
using log4net;
using OpenMetaverse; using OpenMetaverse;
using Nwc.XmlRpc; using Nwc.XmlRpc;
@ -37,9 +39,14 @@ namespace OpenSim.Framework.Communications.Clients
{ {
public class GridClient public class GridClient
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public bool RegisterRegion(string gridServerURL, string sendKey, string receiveKey, RegionInfo regionInfo, out bool forcefulBanLines) public bool RegisterRegion(
string gridServerURL, string sendKey, string receiveKey, RegionInfo regionInfo, out bool forcefulBanLines)
{ {
m_log.InfoFormat(
"[GRID CLIENT]: Registering region {0} with grid at {1}", regionInfo.RegionName, gridServerURL);
forcefulBanLines = true; forcefulBanLines = true;
Hashtable GridParams = new Hashtable(); Hashtable GridParams = new Hashtable();
@ -165,7 +172,9 @@ namespace OpenSim.Framework.Communications.Clients
return true; return true;
} }
public bool RequestNeighborInfo(string gridServerURL, string sendKey, string receiveKey, UUID regionUUID, out RegionInfo regionInfo, out string errorMsg) public bool RequestNeighborInfo(
string gridServerURL, string sendKey, string receiveKey, UUID regionUUID,
out RegionInfo regionInfo, out string errorMsg)
{ {
// didn't find it so far, we have to go the long way // didn't find it so far, we have to go the long way
regionInfo = null; regionInfo = null;
@ -201,7 +210,9 @@ namespace OpenSim.Framework.Communications.Clients
return true; return true;
} }
public bool RequestNeighborInfo(string gridServerURL, string sendKey, string receiveKey, ulong regionHandle, out RegionInfo regionInfo, out string errorMsg) public bool RequestNeighborInfo(
string gridServerURL, string sendKey, string receiveKey, ulong regionHandle,
out RegionInfo regionInfo, out string errorMsg)
{ {
// didn't find it so far, we have to go the long way // didn't find it so far, we have to go the long way
regionInfo = null; regionInfo = null;
@ -257,7 +268,9 @@ namespace OpenSim.Framework.Communications.Clients
return true; return true;
} }
public bool RequestClosestRegion(string gridServerURL, string sendKey, string receiveKey, string regionName, out RegionInfo regionInfo, out string errorMsg) public bool RequestClosestRegion(
string gridServerURL, string sendKey, string receiveKey, string regionName,
out RegionInfo regionInfo, out string errorMsg)
{ {
regionInfo = null; regionInfo = null;
errorMsg = string.Empty; errorMsg = string.Empty;
@ -299,7 +312,8 @@ namespace OpenSim.Framework.Communications.Clients
/// <param name="maxX">Maximum X value</param> /// <param name="maxX">Maximum X value</param>
/// <param name="maxY">Maximum Y value</param> /// <param name="maxY">Maximum Y value</param>
/// <returns>Hashtable of hashtables containing map data elements</returns> /// <returns>Hashtable of hashtables containing map data elements</returns>
public bool MapBlockQuery(string gridServerURL, int minX, int minY, int maxX, int maxY, out Hashtable respData, out string errorMsg) public bool MapBlockQuery(
string gridServerURL, int minX, int minY, int maxX, int maxY, out Hashtable respData, out string errorMsg)
{ {
respData = new Hashtable(); respData = new Hashtable();
errorMsg = string.Empty; errorMsg = string.Empty;

6
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -103,12 +103,12 @@ namespace OpenSim.Region.Communications.OGS1
throw e; throw e;
} }
m_regionsOnInstance.Add(regionInfo);
m_log.InfoFormat( m_log.InfoFormat(
"[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}", "[OGS1 GRID SERVICES]: Registering region {0} with grid at {1}",
regionInfo.RegionName, serversInfo.GridURL); regionInfo.RegionName, serversInfo.GridURL);
m_regionsOnInstance.Add(regionInfo);
Hashtable GridParams = new Hashtable(); Hashtable GridParams = new Hashtable();
// Login / Authentication // Login / Authentication