OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed the bug that sent a region port as the CAPS url, instead of sending the httpListener port.

afrisby
MW 2007-08-27 16:21:16 +00:00
parent ac0d58fd33
commit a45c4626fe
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -455,6 +455,9 @@ namespace OpenSim
} }
break; break;
case "set-time":
break;
case "quit": case "quit":
case "shutdown": case "shutdown":
Shutdown(); Shutdown();

7
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -951,7 +951,7 @@ namespace OpenSim.Region.Environment.Scenes
if (agent.CapsPath != "") if (agent.CapsPath != "")
{ {
//Console.WriteLine("new user, so creating caps handler for it"); //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/"); Util.SetCapsURL(agent.AgentID, "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() + "/CAPS/" + agent.CapsPath + "0000/");
cap.RegisterHandlers(); cap.RegisterHandlers();
cap.AddNewInventoryItem = this.AddInventoryItem; cap.AddNewInventoryItem = this.AddInventoryItem;
@ -1093,6 +1093,11 @@ namespace OpenSim.Region.Environment.Scenes
#endregion #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) public void SendUrlToUser(LLUUID avatarID, string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url)
{ {
if (Avatars.ContainsKey(avatarID)) if (Avatars.ContainsKey(avatarID))