diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 7 |
2 files changed, 4 insertions, 5 deletions
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. |