From a45c4626fed365b200f10e909e9de162766c06f1 Mon Sep 17 00:00:00 2001 From: MW Date: Mon, 27 Aug 2007 16:21:16 +0000 Subject: [PATCH] Fixed the bug that sent a region port as the CAPS url, instead of sending the httpListener port. --- OpenSim/Region/Application/OpenSimMain.cs | 3 +++ OpenSim/Region/Environment/Scenes/Scene.cs | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index ec660f3ae9..0b51759f72 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -455,6 +455,9 @@ namespace OpenSim } break; + case "set-time": + break; + case "quit": case "shutdown": Shutdown(); diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 1fca71973d..2259a3e269 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -951,7 +951,7 @@ namespace OpenSim.Region.Environment.Scenes if (agent.CapsPath != "") { //Console.WriteLine("new user, so creating caps handler for it"); - Caps cap = new Caps(commsManager.AssetCache, httpListener, m_regInfo.ExternalHostName, m_regInfo.ExternalEndPoint.Port, agent.CapsPath, agent.AgentID); + Caps cap = new Caps(commsManager.AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, agent.CapsPath, agent.AgentID); Util.SetCapsURL(agent.AgentID, "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() + "/CAPS/" + agent.CapsPath + "0000/"); cap.RegisterHandlers(); cap.AddNewInventoryItem = this.AddInventoryItem; @@ -1093,6 +1093,11 @@ namespace OpenSim.Region.Environment.Scenes #endregion + public void SetTimePhase(int phase) + { + m_timePhase = phase; + } + public void SendUrlToUser(LLUUID avatarID, string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url) { if (Avatars.ContainsKey(avatarID))