aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
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
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')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs21
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs2
-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
5 files changed, 24 insertions, 3 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index e655aa4..a3b999e 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -101,6 +101,8 @@ namespace OpenSim.Framework
101 /// </summary> 101 /// </summary>
102 public Vector3 startpos; 102 public Vector3 startpos;
103 103
104 public Dictionary<string, object> ServiceURLs;
105
104 public AgentCircuitData() 106 public AgentCircuitData()
105 { 107 {
106 } 108 }
@@ -187,6 +189,16 @@ namespace OpenSim.Framework
187 } 189 }
188 } 190 }
189 191
192 if (ServiceURLs != null && ServiceURLs.Count > 0)
193 {
194 OSDArray urls = new OSDArray(ServiceURLs.Count * 2);
195 foreach (KeyValuePair<string, object> kvp in ServiceURLs)
196 {
197 urls.Add(OSD.FromString(kvp.Key));
198 urls.Add(OSD.FromString((kvp.Value == null) ? string.Empty : kvp.Value.ToString()));
199 }
200 }
201
190 return args; 202 return args;
191 } 203 }
192 204
@@ -270,6 +282,15 @@ namespace OpenSim.Framework
270 Appearance.SetAttachments(attachments); 282 Appearance.SetAttachments(attachments);
271 } 283 }
272 284
285 ServiceURLs = new Dictionary<string, object>();
286 if (args.ContainsKey("service_urls") && args["service_urls"] != null && (args["service_urls"]).Type == OSDType.Array)
287 {
288 OSDArray urls = (OSDArray)(args["service_urls"]);
289 for (int i = 0; i < urls.Count / 2; i++)
290 {
291 ServiceURLs[urls[i * 2].AsString()] = urls[(i * 2) + 1].AsString();
292 }
293 }
273 } 294 }
274 } 295 }
275 296
diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
index ec8dde4..762ea79 100644
--- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
@@ -86,8 +86,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
86 //string portstr = (string)requestData["port"]; 86 //string portstr = (string)requestData["port"];
87 string name = (string)requestData["region_name"]; 87 string name = (string)requestData["region_name"];
88 88
89 m_log.DebugFormat("[HGrid]: Hyperlink request");
90
91 UUID regionID = UUID.Zero; 89 UUID regionID = UUID.Zero;
92 string imageURL = string.Empty; 90 string imageURL = string.Empty;
93 ulong regionHandle = 0; 91 ulong regionHandle = 0;
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;