aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-08-27 16:21:16 +0000
committerMW2007-08-27 16:21:16 +0000
commita45c4626fed365b200f10e909e9de162766c06f1 (patch)
treefb1de72d53032042a95c17bc41f69e79ca601156 /OpenSim
parentget rid of my debugging, it causes a crash on multiple backups (diff)
downloadopensim-SC_OLD-a45c4626fed365b200f10e909e9de162766c06f1.zip
opensim-SC_OLD-a45c4626fed365b200f10e909e9de162766c06f1.tar.gz
opensim-SC_OLD-a45c4626fed365b200f10e909e9de162766c06f1.tar.bz2
opensim-SC_OLD-a45c4626fed365b200f10e909e9de162766c06f1.tar.xz
Fixed the bug that sent a region port as the CAPS url, instead of sending the httpListener port.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs7
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index ec660f3..0b51759 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -455,6 +455,9 @@ namespace OpenSim
455 } 455 }
456 break; 456 break;
457 457
458 case "set-time":
459 break;
460
458 case "quit": 461 case "quit":
459 case "shutdown": 462 case "shutdown":
460 Shutdown(); 463 Shutdown();
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1fca719..2259a3e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -951,7 +951,7 @@ namespace OpenSim.Region.Environment.Scenes
951 if (agent.CapsPath != "") 951 if (agent.CapsPath != "")
952 { 952 {
953 //Console.WriteLine("new user, so creating caps handler for it"); 953 //Console.WriteLine("new user, so creating caps handler for it");
954 Caps cap = new Caps(commsManager.AssetCache, httpListener, m_regInfo.ExternalHostName, m_regInfo.ExternalEndPoint.Port, agent.CapsPath, agent.AgentID); 954 Caps cap = new Caps(commsManager.AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, agent.CapsPath, agent.AgentID);
955 Util.SetCapsURL(agent.AgentID, "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() + "/CAPS/" + agent.CapsPath + "0000/"); 955 Util.SetCapsURL(agent.AgentID, "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() + "/CAPS/" + agent.CapsPath + "0000/");
956 cap.RegisterHandlers(); 956 cap.RegisterHandlers();
957 cap.AddNewInventoryItem = this.AddInventoryItem; 957 cap.AddNewInventoryItem = this.AddInventoryItem;
@@ -1093,6 +1093,11 @@ namespace OpenSim.Region.Environment.Scenes
1093 1093
1094 #endregion 1094 #endregion
1095 1095
1096 public void SetTimePhase(int phase)
1097 {
1098 m_timePhase = phase;
1099 }
1100
1096 public void SendUrlToUser(LLUUID avatarID, string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url) 1101 public void SendUrlToUser(LLUUID avatarID, string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url)
1097 { 1102 {
1098 if (Avatars.ContainsKey(avatarID)) 1103 if (Avatars.ContainsKey(avatarID))