From 31b0f07085eafd63039681b6c57aca289b9fe532 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 6 Jan 2009 18:26:27 +0000
Subject: * Rename GetRandomCapsPath() to GetRandomCapsObjectPath() to fit in
with terminology used elsewhere * Last build break was probably a Bamboo
failure - hopefully this should succeed
---
OpenSim/Framework/Communications/Capabilities/CapsUtil.cs | 6 +++++-
OpenSim/Grid/UserServer/UserLoginService.cs | 2 +-
OpenSim/Region/Communications/Local/LocalLoginService.cs | 2 +-
.../Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 2 +-
.../Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | 2 +-
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 7 +++----
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
return "/CAPS/" + capsObjectPath + "0000/";
}
- public static string GetRandomCapsPath()
+ ///
+ /// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests
+ ///
+ ///
+ public static string GetRandomCapsObjectPath()
{
UUID caps = UUID.Random();
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
response.RegionX = regionInfo.regionLocX;
response.RegionY = regionInfo.regionLocY;
- string capsPath = CapsUtil.GetRandomCapsPath();
+ string capsPath = CapsUtil.GetRandomCapsObjectPath();
response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath);
// 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
response.RegionX = regionInfo.RegionLocX;
response.RegionY = regionInfo.RegionLocY;
- string capsPath = CapsUtil.GetRandomCapsPath();
+ string capsPath = CapsUtil.GetRandomCapsObjectPath();
string capsSeedPath = CapsUtil.GetCapsSeedPath(capsPath);
// 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
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.
--
cgit v1.1