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

Changed name of the hyperlink XMLRPC method to linkk-region, so that it doesn't conflict with the existing one.

remotes/origin/0.6.7-post-fixes
Diva Canto 2009-09-24 05:48:35 -07:00
parent ca69fac13e
commit 2824bbc47b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Server.Handlers.Grid
public HypergridServiceInConnector(IConfigSource config, IHttpServer server) : public HypergridServiceInConnector(IConfigSource config, IHttpServer server) :
base(config, server) base(config, server)
{ {
server.AddXmlRPCHandler("link_region", LinkRegionRequest, false); server.AddXmlRPCHandler("linkk_region", LinkRegionRequest, false);
} }
/// <summary> /// <summary>

2
OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
View File

@ -66,7 +66,7 @@ namespace OpenSim.Services.Connectors.Grid
IList paramList = new ArrayList(); IList paramList = new ArrayList();
paramList.Add(hash); paramList.Add(hash);
XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); XmlRpcRequest request = new XmlRpcRequest("linkk_region", paramList);
string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
m_log.Debug("[HGrid]: Linking to " + uri); m_log.Debug("[HGrid]: Linking to " + uri);
XmlRpcResponse response = request.Send(uri, 10000); XmlRpcResponse response = request.Send(uri, 10000);

4
OpenSim/Services/GridService/GridService.cs
View File

@ -71,7 +71,9 @@ namespace OpenSim.Services.GridService
m_log.WarnFormat("[GRID SERVICE]: Region {0} already registered in scope {1}.", regionInfos.RegionID, scopeID); m_log.WarnFormat("[GRID SERVICE]: Region {0} already registered in scope {1}.", regionInfos.RegionID, scopeID);
return false; return false;
} }
if (m_Database.Get((int)regionInfos.RegionLocX, (int)regionInfos.RegionLocY, scopeID) != null) // This needs better sanity testing. What if regionInfo is registering in
// overlapping coords?
if (m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID) != null)
{ {
m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.", m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.",
regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);