diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs index b19f0fa..258f276 100644 --- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs | |||
@@ -269,7 +269,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
269 | // Internal functions for the above public interface | 269 | // Internal functions for the above public interface |
270 | //------------------------------------------------------------------- | 270 | //------------------------------------------------------------------- |
271 | 271 | ||
272 | protected bool DoCreateChildAgentCall(RegionInfo region, AgentCircuitData aCircuit) | 272 | public bool DoCreateChildAgentCall(RegionInfo region, AgentCircuitData aCircuit) |
273 | { | 273 | { |
274 | // Eventually, we want to use a caps url instead of the agentID | 274 | // Eventually, we want to use a caps url instead of the agentID |
275 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + aCircuit.AgentID + "/"; | 275 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + aCircuit.AgentID + "/"; |
@@ -354,7 +354,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
354 | 354 | ||
355 | } | 355 | } |
356 | 356 | ||
357 | protected bool DoChildAgentUpdateCall(RegionInfo region, IAgentData cAgentData) | 357 | public bool DoChildAgentUpdateCall(RegionInfo region, IAgentData cAgentData) |
358 | { | 358 | { |
359 | // Eventually, we want to use a caps url instead of the agentID | 359 | // Eventually, we want to use a caps url instead of the agentID |
360 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + cAgentData.AgentID + "/"; | 360 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + cAgentData.AgentID + "/"; |
@@ -438,7 +438,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
438 | return true; | 438 | return true; |
439 | } | 439 | } |
440 | 440 | ||
441 | protected bool DoReleaseAgentCall(ulong regionHandle, UUID id, string uri) | 441 | public bool DoReleaseAgentCall(ulong regionHandle, UUID id, string uri) |
442 | { | 442 | { |
443 | //m_log.Debug(" >>> DoReleaseAgentCall <<< " + uri); | 443 | //m_log.Debug(" >>> DoReleaseAgentCall <<< " + uri); |
444 | 444 | ||
@@ -470,7 +470,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
470 | return true; | 470 | return true; |
471 | } | 471 | } |
472 | 472 | ||
473 | protected bool DoCloseAgentCall(RegionInfo region, UUID id) | 473 | public bool DoCloseAgentCall(RegionInfo region, UUID id) |
474 | { | 474 | { |
475 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + id + "/" + region.RegionHandle.ToString() +"/"; | 475 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + id + "/" + region.RegionHandle.ToString() +"/"; |
476 | 476 | ||
@@ -504,7 +504,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
504 | return true; | 504 | return true; |
505 | } | 505 | } |
506 | 506 | ||
507 | protected bool DoCreateObjectCall(RegionInfo region, ISceneObject sog) | 507 | public bool DoCreateObjectCall(RegionInfo region, ISceneObject sog) |
508 | { | 508 | { |
509 | ulong regionHandle = GetRegionHandle(region.RegionHandle); | 509 | ulong regionHandle = GetRegionHandle(region.RegionHandle); |
510 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/object/" + sog.UUID + "/" + regionHandle.ToString() + "/"; | 510 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/object/" + sog.UUID + "/" + regionHandle.ToString() + "/"; |
@@ -585,7 +585,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
585 | 585 | ||
586 | } | 586 | } |
587 | 587 | ||
588 | protected bool DoHelloNeighbourCall(RegionInfo region, RegionInfo thisRegion) | 588 | public bool DoHelloNeighbourCall(RegionInfo region, RegionInfo thisRegion) |
589 | { | 589 | { |
590 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/"; | 590 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/"; |
591 | //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri); | 591 | //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri); |