aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2010-01-17 08:40:05 -0800
committerDiva Canto2010-01-17 08:40:05 -0800
commita7309d90dacf503b0170ad911289c33e9ab42821 (patch)
tree10adee26bcdb9f53acaa4d6ae8535012416cdf7d /OpenSim/Services
parentHyperlinking minimally tested and working. (diff)
downloadopensim-SC_OLD-a7309d90dacf503b0170ad911289c33e9ab42821.zip
opensim-SC_OLD-a7309d90dacf503b0170ad911289c33e9ab42821.tar.gz
opensim-SC_OLD-a7309d90dacf503b0170ad911289c33e9ab42821.tar.bz2
opensim-SC_OLD-a7309d90dacf503b0170ad911289c33e9ab42821.tar.xz
* Added ServiceURLs to AgentCircuitData.
* Fixed a configuration buglet introduced yesterday in StandaloneHypergrid.ini.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs2
-rw-r--r--OpenSim/Services/HypergridService/HGCommands.cs1
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs1
3 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs
index 460acae..0bb1c0e 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
70 70
71 XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); 71 XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
72 string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; 72 string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
73 m_log.Debug("[HGrid]: Linking to " + uri); 73 //m_log.Debug("[HGrid]: Linking to " + uri);
74 XmlRpcResponse response = null; 74 XmlRpcResponse response = null;
75 try 75 try
76 { 76 {
diff --git a/OpenSim/Services/HypergridService/HGCommands.cs b/OpenSim/Services/HypergridService/HGCommands.cs
index f48fd70..78ba46d 100644
--- a/OpenSim/Services/HypergridService/HGCommands.cs
+++ b/OpenSim/Services/HypergridService/HGCommands.cs
@@ -159,6 +159,7 @@ namespace OpenSim.Services.HypergridService
159 string reason = string.Empty; 159 string reason = string.Empty;
160 if (m_HypergridService.TryLinkRegionToCoords(mapName, xloc, yloc, out reason) == null) 160 if (m_HypergridService.TryLinkRegionToCoords(mapName, xloc, yloc, out reason) == null)
161 MainConsole.Instance.Output("Failed to link region: " + reason); 161 MainConsole.Instance.Output("Failed to link region: " + reason);
162 MainConsole.Instance.Output("Hyperlink estalished");
162 } 163 }
163 else 164 else
164 { 165 {
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index b0e36f1..6f92388 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -438,6 +438,7 @@ namespace OpenSim.Services.LLLoginService
438 aCircuit.SecureSessionID = secureSession; 438 aCircuit.SecureSessionID = secureSession;
439 aCircuit.SessionID = session; 439 aCircuit.SessionID = session;
440 aCircuit.startpos = position; 440 aCircuit.startpos = position;
441 aCircuit.ServiceURLs = account.ServiceURLs;
441 442
442 if (simConnector.CreateAgent(region, aCircuit, 0, out reason)) 443 if (simConnector.CreateAgent(region, aCircuit, 0, out reason))
443 return aCircuit; 444 return aCircuit;