aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2009-09-26 11:01:18 -0700
committerDiva Canto2009-09-26 11:01:18 -0700
commitdcfd08b8dd57e667db8e0b5900da4648a020160e (patch)
tree48bc721a24e861549417b228c526382d36ad98a3 /OpenSim/Server
parentFixed the order of params to GetRegionRange. (diff)
downloadopensim-SC_OLD-dcfd08b8dd57e667db8e0b5900da4648a020160e.zip
opensim-SC_OLD-dcfd08b8dd57e667db8e0b5900da4648a020160e.tar.gz
opensim-SC_OLD-dcfd08b8dd57e667db8e0b5900da4648a020160e.tar.bz2
opensim-SC_OLD-dcfd08b8dd57e667db8e0b5900da4648a020160e.tar.xz
Fixed a bug with link-region.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs17
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
index ad63485..d2e791b 100644
--- a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
+++ b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
@@ -36,6 +36,7 @@ using OpenSim.Server.Base;
36using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
37using OpenSim.Framework.Servers.HttpServer; 37using OpenSim.Framework.Servers.HttpServer;
38using OpenSim.Server.Handlers.Base; 38using OpenSim.Server.Handlers.Base;
39using GridRegion = OpenSim.Services.Interfaces.GridRegion;
39 40
40using log4net; 41using log4net;
41using Nwc.XmlRpc; 42using Nwc.XmlRpc;
@@ -48,12 +49,12 @@ namespace OpenSim.Server.Handlers.Grid
48 LogManager.GetLogger( 49 LogManager.GetLogger(
49 MethodBase.GetCurrentMethod().DeclaringType); 50 MethodBase.GetCurrentMethod().DeclaringType);
50 51
51 private List<SimpleRegionInfo> m_RegionsOnSim = new List<SimpleRegionInfo>(); 52 private List<GridRegion> m_RegionsOnSim = new List<GridRegion>();
52 53
53 public HypergridServiceInConnector(IConfigSource config, IHttpServer server) : 54 public HypergridServiceInConnector(IConfigSource config, IHttpServer server) :
54 base(config, server) 55 base(config, server)
55 { 56 {
56 server.AddXmlRPCHandler("linkk_region", LinkRegionRequest, false); 57 server.AddXmlRPCHandler("link_region", LinkRegionRequest, false);
57 } 58 }
58 59
59 /// <summary> 60 /// <summary>
@@ -70,8 +71,8 @@ namespace OpenSim.Server.Handlers.Grid
70 71
71 m_log.DebugFormat("[HGrid]: Hyperlink request"); 72 m_log.DebugFormat("[HGrid]: Hyperlink request");
72 73
73 SimpleRegionInfo regInfo = null; 74 GridRegion regInfo = null;
74 foreach (SimpleRegionInfo r in m_RegionsOnSim) 75 foreach (GridRegion r in m_RegionsOnSim)
75 { 76 {
76 if ((r.RegionName != null) && (name != null) && (r.RegionName.ToLower() == name.ToLower())) 77 if ((r.RegionName != null) && (name != null) && (r.RegionName.ToLower() == name.ToLower()))
77 { 78 {
@@ -85,9 +86,9 @@ namespace OpenSim.Server.Handlers.Grid
85 86
86 Hashtable hash = new Hashtable(); 87 Hashtable hash = new Hashtable();
87 hash["uuid"] = regInfo.RegionID.ToString(); 88 hash["uuid"] = regInfo.RegionID.ToString();
89 m_log.Debug(">> Here " + regInfo.RegionID);
88 hash["handle"] = regInfo.RegionHandle.ToString(); 90 hash["handle"] = regInfo.RegionHandle.ToString();
89 //m_log.Debug(">> Here " + regInfo.RegionHandle); 91 hash["region_image"] = regInfo.TerrainImage.ToString();
90 //hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString();
91 hash["region_name"] = regInfo.RegionName; 92 hash["region_name"] = regInfo.RegionName;
92 hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); 93 hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
93 //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port); 94 //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port);
@@ -98,12 +99,12 @@ namespace OpenSim.Server.Handlers.Grid
98 return response; 99 return response;
99 } 100 }
100 101
101 public void AddRegion(SimpleRegionInfo rinfo) 102 public void AddRegion(GridRegion rinfo)
102 { 103 {
103 m_RegionsOnSim.Add(rinfo); 104 m_RegionsOnSim.Add(rinfo);
104 } 105 }
105 106
106 public void RemoveRegion(SimpleRegionInfo rinfo) 107 public void RemoveRegion(GridRegion rinfo)
107 { 108 {
108 if (m_RegionsOnSim.Contains(rinfo)) 109 if (m_RegionsOnSim.Contains(rinfo))
109 m_RegionsOnSim.Remove(rinfo); 110 m_RegionsOnSim.Remove(rinfo);