aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-06 17:27:04 +0000
committerJustin Clarke Casey2009-01-06 17:27:04 +0000
commitb1c2cb3d8206b845a26fe04371dc1a1a6b2cbec2 (patch)
treea8b3e4dc31294e0d9507dcdbd0bfae5e1a42145c /OpenSim/Region/Environment/Scenes
parent* Remove unused CAPSService (diff)
downloadopensim-SC_OLD-b1c2cb3d8206b845a26fe04371dc1a1a6b2cbec2.zip
opensim-SC_OLD-b1c2cb3d8206b845a26fe04371dc1a1a6b2cbec2.tar.gz
opensim-SC_OLD-b1c2cb3d8206b845a26fe04371dc1a1a6b2cbec2.tar.bz2
opensim-SC_OLD-b1c2cb3d8206b845a26fe04371dc1a1a6b2cbec2.tar.xz
* minor: Move GetRandomCapsPath() to a CapsUtil class
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs9
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs5
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
index c53605f..b793de1 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -31,17 +31,16 @@ using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Threading; 33using System.Threading;
34
35using OpenMetaverse;
36
37using log4net; 34using log4net;
35using OpenMetaverse;
36using OSD = OpenMetaverse.StructuredData.OSD;
38using OpenSim.Framework; 37using OpenSim.Framework;
39using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
40using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Communications.Capabilities;
41using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Environment.Scenes;
42using OpenSim.Region.Environment; 42using OpenSim.Region.Environment;
43using OpenSim.Region.Interfaces; 43using OpenSim.Region.Interfaces;
44using OSD = OpenMetaverse.StructuredData.OSD;
45 44
46namespace OpenSim.Region.Environment.Scenes.Hypergrid 45namespace OpenSim.Region.Environment.Scenes.Hypergrid
47{ 46{
@@ -189,7 +188,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
189 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) 188 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
190 { 189 {
191 // brand new agent, let's create a new caps seed 190 // brand new agent, let's create a new caps seed
192 agentCircuit.CapsPath = Util.GetRandomCapsPath(); 191 agentCircuit.CapsPath = CapsUtil.GetRandomCapsPath();
193 } 192 }
194 193
195 //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 9282f14..82b9d89 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -36,6 +36,7 @@ using log4net;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Capabilities;
39using OpenSim.Region.Interfaces; 40using OpenSim.Region.Interfaces;
40using OSD = OpenMetaverse.StructuredData.OSD; 41using OSD = OpenMetaverse.StructuredData.OSD;
41 42
@@ -393,7 +394,7 @@ namespace OpenSim.Region.Environment.Scenes
393 394
394 if (newRegions.Contains(neighbour.RegionHandle)) 395 if (newRegions.Contains(neighbour.RegionHandle))
395 { 396 {
396 agent.CapsPath = Util.GetRandomCapsPath(); 397 agent.CapsPath = CapsUtil.GetRandomCapsPath();
397 avatar.AddNeighbourRegion(neighbour.RegionHandle, agent.CapsPath); 398 avatar.AddNeighbourRegion(neighbour.RegionHandle, agent.CapsPath);
398 seeds.Add(neighbour.RegionHandle, agent.CapsPath); 399 seeds.Add(neighbour.RegionHandle, agent.CapsPath);
399 } 400 }
@@ -784,7 +785,7 @@ namespace OpenSim.Region.Environment.Scenes
784 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) 785 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
785 { 786 {
786 // brand new agent, let's create a new caps seed 787 // brand new agent, let's create a new caps seed
787 agentCircuit.CapsPath = Util.GetRandomCapsPath(); 788 agentCircuit.CapsPath = CapsUtil.GetRandomCapsPath();
788 } 789 }
789 790
790 // Let's create an agent there if one doesn't exist yet. 791 // Let's create an agent there if one doesn't exist yet.