From b1c2cb3d8206b845a26fe04371dc1a1a6b2cbec2 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 6 Jan 2009 17:27:04 +0000
Subject: * minor: Move GetRandomCapsPath() to a CapsUtil class

---
 .../Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs  | 9 ++++-----
 OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs   | 5 +++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

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;
 using System.Net;
 using System.Reflection;
 using System.Threading;
-
-using OpenMetaverse;
-
 using log4net;
+using OpenMetaverse;
+using OSD = OpenMetaverse.StructuredData.OSD;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Interfaces;
-using OSD = OpenMetaverse.StructuredData.OSD;
 
 namespace OpenSim.Region.Environment.Scenes.Hypergrid
 {
@@ -189,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 = Util.GetRandomCapsPath();
+                            agentCircuit.CapsPath = CapsUtil.GetRandomCapsPath();
                         }
 
                         //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;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Region.Interfaces;
 using OSD = OpenMetaverse.StructuredData.OSD;
 
@@ -393,7 +394,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                     if (newRegions.Contains(neighbour.RegionHandle))
                     {
-                        agent.CapsPath = Util.GetRandomCapsPath();
+                        agent.CapsPath = CapsUtil.GetRandomCapsPath();
                         avatar.AddNeighbourRegion(neighbour.RegionHandle, agent.CapsPath);
                         seeds.Add(neighbour.RegionHandle, agent.CapsPath);
                     }
@@ -784,7 +785,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 = Util.GetRandomCapsPath();
+                            agentCircuit.CapsPath = CapsUtil.GetRandomCapsPath();
                         }
 
                         // Let's create an agent there if one doesn't exist yet. 
-- 
cgit v1.1