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 --- .../Modules/InterGrid/OpenGridProtocolModule.cs | 25 ++++++++++------------ .../Hypergrid/HGSceneCommunicationService.cs | 9 ++++---- .../Scenes/SceneCommunicationService.cs | 5 +++-- 3 files changed, 18 insertions(+), 21 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index 8534b56..75755cb 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs @@ -42,6 +42,7 @@ using OpenMetaverse.Packets; using log4net; using Nini.Config; using OpenSim.Framework; +using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Servers; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; @@ -377,7 +378,6 @@ namespace OpenSim.Region.Environment.Modules.InterGrid */ } - public OSD RequestRezAvatarMethod(string path, OSD request) { //System.Console.WriteLine("[REQUESTREZAVATAR]: " + request.ToString()); @@ -468,28 +468,28 @@ namespace OpenSim.Region.Environment.Modules.InterGrid // Generate a dummy agent for the user so we can get back a CAPS path AgentCircuitData agentData = new AgentCircuitData(); agentData.AgentID = LocalAgentID; - agentData.BaseFolder=UUID.Zero; - agentData.CapsPath=Util.GetRandomCapsPath(); + agentData.BaseFolder = UUID.Zero; + agentData.CapsPath = CapsUtil.GetRandomCapsPath(); agentData.child = false; agentData.circuitcode = (uint)(Util.RandomClass.Next()); agentData.firstname = FirstName; agentData.lastname = LastName; - agentData.SecureSessionID=UUID.Random(); - agentData.SessionID=UUID.Random(); + agentData.SecureSessionID = UUID.Random(); + agentData.SessionID = UUID.Random(); agentData.startpos = new Vector3(128f, 128f, 100f); // Pre-Fill our region cache with information on the agent. UserAgentData useragent = new UserAgentData(); - useragent.AgentIP="unknown"; - useragent.AgentOnline=true; + useragent.AgentIP = "unknown"; + useragent.AgentOnline = true; useragent.AgentPort = (uint)0; useragent.Handle = regionhandle; useragent.InitialRegion = reg.originRegionID; - useragent.LoginTime=Util.UnixTimeSinceEpoch(); + useragent.LoginTime = Util.UnixTimeSinceEpoch(); useragent.LogoutTime = 0; - useragent.Position=agentData.startpos; - useragent.Region=reg.originRegionID; - useragent.SecureSessionID=agentData.SecureSessionID; + useragent.Position = agentData.startpos; + useragent.Region = reg.originRegionID; + useragent.SecureSessionID = agentData.SecureSessionID; useragent.SessionID = agentData.SessionID; UserProfileData userProfile = new UserProfileData(); @@ -565,7 +565,6 @@ namespace OpenSim.Region.Environment.Modules.InterGrid string httpaddr = reg.ExternalHostName; string urlport = reg.HttpPort.ToString(); - if (httpSSL) { rezHttpProtocol = "https://"; @@ -576,8 +575,6 @@ namespace OpenSim.Region.Environment.Modules.InterGrid httpaddr = httpsCN; } - - // DEPRECIATED responseMap["seed_capability"] = OSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); 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