* Rename GetRandomCapsPath() to GetRandomCapsObjectPath() to fit in with terminology used elsewhere

* Last build break was probably a Bamboo failure - hopefully this should succeed

3 files changed, 5 insertions, 6 deletions

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
             AgentCircuitData agentData = new AgentCircuitData();
             agentData.AgentID = LocalAgentID;
             agentData.BaseFolder = UUID.Zero;
-            agentData.CapsPath = CapsUtil.GetRandomCapsPath();
+            agentData.CapsPath = CapsUtil.GetRandomCapsObjectPath();
             agentData.child = false;
             agentData.circuitcode = (uint)(Util.RandomClass.Next());
             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
                         if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
                         {
                             // brand new agent, let's create a new caps seed
-                            agentCircuit.CapsPath = CapsUtil.GetRandomCapsPath();
+                            agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
                         }
 
                         //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
 
                     if (newRegions.Contains(neighbour.RegionHandle))
                     {
-                        agent.CapsPath = CapsUtil.GetRandomCapsPath();
+                        agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
                         avatar.AddNeighbourRegion(neighbour.RegionHandle, agent.CapsPath);
                         seeds.Add(neighbour.RegionHandle, agent.CapsPath);
                     }
@@ -682,7 +682,7 @@ namespace OpenSim.Region.Environment.Scenes
         public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position,
                                                       Vector3 lookAt, uint teleportFlags)
         {
-            m_log.DebugFormat("[SCENE COMMUNICATION SERVICE] RequestTeleportToLocation {0} ", position.ToString());
+            m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation {0} ", position.ToString());
 
             if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID))
                 return;
@@ -732,7 +732,6 @@ namespace OpenSim.Region.Environment.Scenes
                     {
                         // region is remote. see if it is up
                         destRegionUp = m_commsProvider.InterRegion.CheckRegion(reg.RemotingAddress, reg.RemotingPort);
-
                     }
                     else
                     {
@@ -785,7 +784,7 @@ namespace OpenSim.Region.Environment.Scenes
                         if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
                         {
                             // brand new agent, let's create a new caps seed
-                            agentCircuit.CapsPath = CapsUtil.GetRandomCapsPath();
+                            agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
                         }
 
                         // Let's create an agent there if one doesn't exist yet.