aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
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/Framework
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/Framework')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs21
1 files changed, 21 insertions, 0 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