aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-06 18:26:27 +0000
committerJustin Clarke Casey2009-01-06 18:26:27 +0000
commit31b0f07085eafd63039681b6c57aca289b9fe532 (patch)
tree5b0c08992715c98efdfd9bfe6cf54ea43aaa3321
parent* Fix build break - forgot that I had renamed an argument (diff)
downloadopensim-SC_OLD-31b0f07085eafd63039681b6c57aca289b9fe532.zip
opensim-SC_OLD-31b0f07085eafd63039681b6c57aca289b9fe532.tar.gz
opensim-SC_OLD-31b0f07085eafd63039681b6c57aca289b9fe532.tar.bz2
opensim-SC_OLD-31b0f07085eafd63039681b6c57aca289b9fe532.tar.xz
* Rename GetRandomCapsPath() to GetRandomCapsObjectPath() to fit in with terminology used elsewhere
* Last build break was probably a Bamboo failure - hopefully this should succeed
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/CapsUtil.cs6
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs7
6 files changed, 12 insertions, 9 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs b/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
index fe9780d..829b4e5 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
@@ -45,7 +45,11 @@ namespace OpenSim.Framework.Communications.Capabilities
45 return "/CAPS/" + capsObjectPath + "0000/"; 45 return "/CAPS/" + capsObjectPath + "0000/";
46 } 46 }
47 47
48 public static string GetRandomCapsPath() 48 /// <summary>
49 /// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests
50 /// </summary>
51 /// <returns></returns>
52 public static string GetRandomCapsObjectPath()
49 { 53 {
50 UUID caps = UUID.Random(); 54 UUID caps = UUID.Random();
51 string capsPath = caps.ToString(); 55 string capsPath = caps.ToString();
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index deff45e..cca5be2 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -309,7 +309,7 @@ namespace OpenSim.Grid.UserServer
309 response.RegionX = regionInfo.regionLocX; 309 response.RegionX = regionInfo.regionLocX;
310 response.RegionY = regionInfo.regionLocY; 310 response.RegionY = regionInfo.regionLocY;
311 311
312 string capsPath = CapsUtil.GetRandomCapsPath(); 312 string capsPath = CapsUtil.GetRandomCapsObjectPath();
313 response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath); 313 response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath);
314 314
315 // Notify the target of an incoming user 315 // Notify the target of an incoming user
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 8a805df..9ee10e8 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -296,7 +296,7 @@ namespace OpenSim.Region.Communications.Local
296 response.RegionX = regionInfo.RegionLocX; 296 response.RegionX = regionInfo.RegionLocX;
297 response.RegionY = regionInfo.RegionLocY; 297 response.RegionY = regionInfo.RegionLocY;
298 298
299 string capsPath = CapsUtil.GetRandomCapsPath(); 299 string capsPath = CapsUtil.GetRandomCapsObjectPath();
300 string capsSeedPath = CapsUtil.GetCapsSeedPath(capsPath); 300 string capsSeedPath = CapsUtil.GetCapsSeedPath(capsPath);
301 301
302 // Don't use the following! It Fails for logging into any region not on the same port as the http server! 302 // Don't use the following! It Fails for logging into any region not on the same port as the http server!
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index a03bae3..a493117 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -469,7 +469,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
469 AgentCircuitData agentData = new AgentCircuitData(); 469 AgentCircuitData agentData = new AgentCircuitData();
470 agentData.AgentID = LocalAgentID; 470 agentData.AgentID = LocalAgentID;
471 agentData.BaseFolder = UUID.Zero; 471 agentData.BaseFolder = UUID.Zero;
472 agentData.CapsPath = CapsUtil.GetRandomCapsPath(); 472 agentData.CapsPath = CapsUtil.GetRandomCapsObjectPath();
473 agentData.child = false; 473 agentData.child = false;
474 agentData.circuitcode = (uint)(Util.RandomClass.Next()); 474 agentData.circuitcode = (uint)(Util.RandomClass.Next());
475 agentData.firstname = FirstName; 475 agentData.firstname = FirstName;
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 14e0a15..bb7406f 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -188,7 +188,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
188 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) 188 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
189 { 189 {
190 // brand new agent, let's create a new caps seed 190 // brand new agent, let's create a new caps seed
191 agentCircuit.CapsPath = CapsUtil.GetRandomCapsPath(); 191 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
192 } 192 }
193 193
194 //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit)) 194 //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit))
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 7f56e71..ba8080c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -394,7 +394,7 @@ namespace OpenSim.Region.Environment.Scenes
394 394
395 if (newRegions.Contains(neighbour.RegionHandle)) 395 if (newRegions.Contains(neighbour.RegionHandle))
396 { 396 {
397 agent.CapsPath = CapsUtil.GetRandomCapsPath(); 397 agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
398 avatar.AddNeighbourRegion(neighbour.RegionHandle, agent.CapsPath); 398 avatar.AddNeighbourRegion(neighbour.RegionHandle, agent.CapsPath);
399 seeds.Add(neighbour.RegionHandle, agent.CapsPath); 399 seeds.Add(neighbour.RegionHandle, agent.CapsPath);
400 } 400 }
@@ -682,7 +682,7 @@ namespace OpenSim.Region.Environment.Scenes
682 public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position, 682 public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position,
683 Vector3 lookAt, uint teleportFlags) 683 Vector3 lookAt, uint teleportFlags)
684 { 684 {
685 m_log.DebugFormat("[SCENE COMMUNICATION SERVICE] RequestTeleportToLocation {0} ", position.ToString()); 685 m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation {0} ", position.ToString());
686 686
687 if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) 687 if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID))
688 return; 688 return;
@@ -732,7 +732,6 @@ namespace OpenSim.Region.Environment.Scenes
732 { 732 {
733 // region is remote. see if it is up 733 // region is remote. see if it is up
734 destRegionUp = m_commsProvider.InterRegion.CheckRegion(reg.RemotingAddress, reg.RemotingPort); 734 destRegionUp = m_commsProvider.InterRegion.CheckRegion(reg.RemotingAddress, reg.RemotingPort);
735
736 } 735 }
737 else 736 else
738 { 737 {
@@ -785,7 +784,7 @@ namespace OpenSim.Region.Environment.Scenes
785 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) 784 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
786 { 785 {
787 // brand new agent, let's create a new caps seed 786 // brand new agent, let's create a new caps seed
788 agentCircuit.CapsPath = CapsUtil.GetRandomCapsPath(); 787 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
789 } 788 }
790 789
791 // 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.