diff options
author | Diva Canto | 2010-08-06 17:43:09 -0700 |
---|---|---|
committer | Diva Canto | 2010-08-06 17:43:09 -0700 |
commit | 009053479302e7581a85c7574a6cc8eaa23745d8 (patch) | |
tree | 7b11018e7368719d40f75d475db45777e6fecf2b /OpenSim/Services/Connectors/Grid | |
parent | Allow creation of link regions if there is an existing region within a 4096 r... (diff) | |
download | opensim-SC_OLD-009053479302e7581a85c7574a6cc8eaa23745d8.zip opensim-SC_OLD-009053479302e7581a85c7574a6cc8eaa23745d8.tar.gz opensim-SC_OLD-009053479302e7581a85c7574a6cc8eaa23745d8.tar.bz2 opensim-SC_OLD-009053479302e7581a85c7574a6cc8eaa23745d8.tar.xz |
Added Check4096 config var under [GridService], at the request of many. Changed the iteration that Marck had on the Hyperlinker.
ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.
Diffstat (limited to 'OpenSim/Services/Connectors/Grid')
-rw-r--r-- | OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs index 202bad7..80f0d2d 100644 --- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | |||
@@ -556,55 +556,55 @@ namespace OpenSim.Services.Connectors | |||
556 | return rinfos; | 556 | return rinfos; |
557 | } | 557 | } |
558 | 558 | ||
559 | public List<GridRegion> GetHyperlinks(UUID scopeID) | 559 | public List<GridRegion> GetHyperlinks(UUID scopeID) |
560 | { | 560 | { |
561 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 561 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
562 | 562 | ||
563 | sendData["SCOPEID"] = scopeID.ToString(); | 563 | sendData["SCOPEID"] = scopeID.ToString(); |
564 | 564 | ||
565 | sendData["METHOD"] = "get_hyperlinks"; | 565 | sendData["METHOD"] = "get_hyperlinks"; |
566 | 566 | ||
567 | List<GridRegion> rinfos = new List<GridRegion>(); | 567 | List<GridRegion> rinfos = new List<GridRegion>(); |
568 | string reply = string.Empty; | 568 | string reply = string.Empty; |
569 | try | 569 | try |
570 | { | 570 | { |
571 | reply = SynchronousRestFormsRequester.MakeRequest("POST", | 571 | reply = SynchronousRestFormsRequester.MakeRequest("POST", |
572 | m_ServerURI + "/grid", | 572 | m_ServerURI + "/grid", |
573 | ServerUtils.BuildQueryString(sendData)); | 573 | ServerUtils.BuildQueryString(sendData)); |
574 | 574 | ||
575 | //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply); | 575 | //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply); |
576 | } | 576 | } |
577 | catch (Exception e) | 577 | catch (Exception e) |
578 | { | 578 | { |
579 | m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); | 579 | m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); |
580 | return rinfos; | 580 | return rinfos; |
581 | } | 581 | } |
582 | 582 | ||
583 | if (reply != string.Empty) | 583 | if (reply != string.Empty) |
584 | { | 584 | { |
585 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); | 585 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); |
586 | 586 | ||
587 | if (replyData != null) | 587 | if (replyData != null) |
588 | { | 588 | { |
589 | Dictionary<string, object>.ValueCollection rinfosList = replyData.Values; | 589 | Dictionary<string, object>.ValueCollection rinfosList = replyData.Values; |
590 | foreach (object r in rinfosList) | 590 | foreach (object r in rinfosList) |
591 | { | 591 | { |
592 | if (r is Dictionary<string, object>) | 592 | if (r is Dictionary<string, object>) |
593 | { | 593 | { |
594 | GridRegion rinfo = new GridRegion((Dictionary<string, object>)r); | 594 | GridRegion rinfo = new GridRegion((Dictionary<string, object>)r); |
595 | rinfos.Add(rinfo); | 595 | rinfos.Add(rinfo); |
596 | } | 596 | } |
597 | } | 597 | } |
598 | } | 598 | } |
599 | else | 599 | else |
600 | m_log.DebugFormat("[GRID CONNECTOR]: GetHyperlinks {0} received null response", | 600 | m_log.DebugFormat("[GRID CONNECTOR]: GetHyperlinks {0} received null response", |
601 | scopeID); | 601 | scopeID); |
602 | } | 602 | } |
603 | else | 603 | else |
604 | m_log.DebugFormat("[GRID CONNECTOR]: GetHyperlinks received null reply"); | 604 | m_log.DebugFormat("[GRID CONNECTOR]: GetHyperlinks received null reply"); |
605 | 605 | ||
606 | return rinfos; | 606 | return rinfos; |
607 | } | 607 | } |
608 | 608 | ||
609 | public virtual int GetRegionFlags(UUID scopeID, UUID regionID) | 609 | public virtual int GetRegionFlags(UUID scopeID, UUID regionID) |
610 | { | 610 | { |