OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

* Last build break was probably a Bamboo failure - hopefully this should succeed
0.6.2-post-fixes
Justin Clarke Casey 2009-01-06 18:26:27 +00:00
parent 498cd4f987
commit 31b0f07085
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
View File

@ -45,7 +45,11 @@ namespace OpenSim.Framework.Communications.Capabilities
return "/CAPS/" + capsObjectPath + "0000/"; return "/CAPS/" + capsObjectPath + "0000/";
} }
public static string GetRandomCapsPath() /// <summary>
/// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests
/// </summary>
/// <returns></returns>
public static string GetRandomCapsObjectPath()
{ {
UUID caps = UUID.Random(); UUID caps = UUID.Random();
string capsPath = caps.ToString(); string capsPath = caps.ToString();

2
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@ -309,7 +309,7 @@ namespace OpenSim.Grid.UserServer
response.RegionX = regionInfo.regionLocX; response.RegionX = regionInfo.regionLocX;
response.RegionY = regionInfo.regionLocY; response.RegionY = regionInfo.regionLocY;
string capsPath = CapsUtil.GetRandomCapsPath(); string capsPath = CapsUtil.GetRandomCapsObjectPath();
response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath); response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath);
// Notify the target of an incoming user // Notify the target of an incoming user

2
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@ -296,7 +296,7 @@ namespace OpenSim.Region.Communications.Local
response.RegionX = regionInfo.RegionLocX; response.RegionX = regionInfo.RegionLocX;
response.RegionY = regionInfo.RegionLocY; response.RegionY = regionInfo.RegionLocY;
string capsPath = CapsUtil.GetRandomCapsPath(); string capsPath = CapsUtil.GetRandomCapsObjectPath();
string capsSeedPath = CapsUtil.GetCapsSeedPath(capsPath); 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! // Don't use the following! It Fails for logging into any region not on the same port as the http server!

2
OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
View File

@ -469,7 +469,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
AgentCircuitData agentData = new AgentCircuitData(); AgentCircuitData agentData = new AgentCircuitData();
agentData.AgentID = LocalAgentID; agentData.AgentID = LocalAgentID;
agentData.BaseFolder = UUID.Zero; agentData.BaseFolder = UUID.Zero;
agentData.CapsPath = CapsUtil.GetRandomCapsPath(); agentData.CapsPath = CapsUtil.GetRandomCapsObjectPath();
agentData.child = false; agentData.child = false;
agentData.circuitcode = (uint)(Util.RandomClass.Next()); agentData.circuitcode = (uint)(Util.RandomClass.Next());
agentData.firstname = FirstName; agentData.firstname = FirstName;

2
OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
View File

@ -188,7 +188,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
{ {
// brand new agent, let's create a new caps seed // 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)) //if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agentCircuit))

7
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -394,7 +394,7 @@ namespace OpenSim.Region.Environment.Scenes
if (newRegions.Contains(neighbour.RegionHandle)) if (newRegions.Contains(neighbour.RegionHandle))
{ {
agent.CapsPath = CapsUtil.GetRandomCapsPath(); agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
avatar.AddNeighbourRegion(neighbour.RegionHandle, agent.CapsPath); avatar.AddNeighbourRegion(neighbour.RegionHandle, agent.CapsPath);
seeds.Add(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, public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position,
Vector3 lookAt, uint teleportFlags) 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)) if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID))
return; return;
@ -732,7 +732,6 @@ namespace OpenSim.Region.Environment.Scenes
{ {
// region is remote. see if it is up // region is remote. see if it is up
destRegionUp = m_commsProvider.InterRegion.CheckRegion(reg.RemotingAddress, reg.RemotingPort); destRegionUp = m_commsProvider.InterRegion.CheckRegion(reg.RemotingAddress, reg.RemotingPort);
} }
else else
{ {
@ -785,7 +784,7 @@ namespace OpenSim.Region.Environment.Scenes
if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
{ {
// brand new agent, let's create a new caps seed // 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. // Let's create an agent there if one doesn't exist yet.