aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorMelanie2010-08-07 05:39:20 +0100
committerMelanie2010-08-07 05:39:20 +0100
commita04efe4a4df06c6d1e4adccc1e5d3d6f4842f067 (patch)
treeb2e36a0e20227fc45465e8f12ddab83044408586 /OpenSim/Server
parentCorrect display of landmark about info. Also correct region maturity rating (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a04efe4a4df06c6d1e4adccc1e5d3d6f4842f067.zip
opensim-SC_OLD-a04efe4a4df06c6d1e4adccc1e5d3d6f4842f067.tar.gz
opensim-SC_OLD-a04efe4a4df06c6d1e4adccc1e5d3d6f4842f067.tar.bz2
opensim-SC_OLD-a04efe4a4df06c6d1e4adccc1e5d3d6f4842f067.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs33
1 files changed, 33 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index c90dd6f..913c6c9 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -109,6 +109,9 @@ namespace OpenSim.Server.Handlers.Grid
109 case "get_fallback_regions": 109 case "get_fallback_regions":
110 return GetFallbackRegions(request); 110 return GetFallbackRegions(request);
111 111
112 case "get_hyperlinks":
113 return GetHyperlinks(request);
114
112 case "get_region_flags": 115 case "get_region_flags":
113 return GetRegionFlags(request); 116 return GetRegionFlags(request);
114 } 117 }
@@ -483,6 +486,36 @@ namespace OpenSim.Server.Handlers.Grid
483 return encoding.GetBytes(xmlString); 486 return encoding.GetBytes(xmlString);
484 } 487 }
485 488
489 byte[] GetHyperlinks(Dictionary<string, object> request)
490 {
491 //m_log.DebugFormat("[GRID HANDLER]: GetHyperlinks");
492 UUID scopeID = UUID.Zero;
493 if (request.ContainsKey("SCOPEID"))
494 UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
495 else
496 m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get linked regions");
497
498 List<GridRegion> rinfos = m_GridService.GetHyperlinks(scopeID);
499
500 Dictionary<string, object> result = new Dictionary<string, object>();
501 if ((rinfos == null) || ((rinfos != null) && (rinfos.Count == 0)))
502 result["result"] = "null";
503 else
504 {
505 int i = 0;
506 foreach (GridRegion rinfo in rinfos)
507 {
508 Dictionary<string, object> rinfoDict = rinfo.ToKeyValuePairs();
509 result["region" + i] = rinfoDict;
510 i++;
511 }
512 }
513 string xmlString = ServerUtils.BuildXmlResponse(result);
514 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
515 UTF8Encoding encoding = new UTF8Encoding();
516 return encoding.GetBytes(xmlString);
517 }
518
486 byte[] GetRegionFlags(Dictionary<string, object> request) 519 byte[] GetRegionFlags(Dictionary<string, object> request)
487 { 520 {
488 UUID scopeID = UUID.Zero; 521 UUID scopeID = UUID.Zero;