aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authordiva2009-01-03 07:05:33 +0000
committerdiva2009-01-03 07:05:33 +0000
commit158de95bde7cdee09334c40baee5122fd8f196e2 (patch)
tree8a8b1f41db53475cca08633cbeec09d5425a8745 /OpenSim/Region/Environment/Scenes
parentPlumbing for moving InformRegionOfChildAgent over to RESTComms: pack and unpa... (diff)
downloadopensim-SC_OLD-158de95bde7cdee09334c40baee5122fd8f196e2.zip
opensim-SC_OLD-158de95bde7cdee09334c40baee5122fd8f196e2.tar.gz
opensim-SC_OLD-158de95bde7cdee09334c40baee5122fd8f196e2.tar.bz2
opensim-SC_OLD-158de95bde7cdee09334c40baee5122fd8f196e2.tar.xz
Another interregion comms change that will not work well with previous versions. This commit moves InformRegionOfChildAgent from OGS1 to RESTComms, effectively having the complete child agent life cycle over REST: create=POST, update=PUT, close=DELETE.
Additional changes include more functions in the IHyperlink interface, and some refactorings in the HG code for better reuse in RESTComms.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs6
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 5e1621b..c53605f 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -192,7 +192,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
192 agentCircuit.CapsPath = Util.GetRandomCapsPath(); 192 agentCircuit.CapsPath = Util.GetRandomCapsPath();
193 } 193 }
194 194
195 if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) 195 //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit))
196 if (!m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, agentCircuit))
196 { 197 {
197 avatar.ControllingClient.SendTeleportFailed("Destination is not accepting teleports."); 198 avatar.ControllingClient.SendTeleportFailed("Destination is not accepting teleports.");
198 return; 199 return;
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 8b3ac4f..9282f14 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -296,7 +296,8 @@ namespace OpenSim.Region.Environment.Scenes
296 string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort 296 string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort
297 + "/CAPS/" + a.CapsPath + "0000/"; 297 + "/CAPS/" + a.CapsPath + "0000/";
298 298
299 bool regionAccepted = m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, a); 299 //bool regionAccepted = m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, a);
300 bool regionAccepted = m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, a);
300 301
301 if (regionAccepted && newAgent) 302 if (regionAccepted && newAgent)
302 { 303 {
@@ -787,7 +788,8 @@ namespace OpenSim.Region.Environment.Scenes
787 } 788 }
788 789
789 // Let's create an agent there if one doesn't exist yet. 790 // Let's create an agent there if one doesn't exist yet.
790 if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) 791 //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit))
792 if (!m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, agentCircuit))
791 { 793 {
792 avatar.ControllingClient.SendTeleportFailed("Destination is not accepting teleports."); 794 avatar.ControllingClient.SendTeleportFailed("Destination is not accepting teleports.");
793 return; 795 return;