diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 7 |
1 files changed, 6 insertions, 1 deletions
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)) |