diff options
author | Diva Canto | 2009-09-23 17:20:07 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-23 17:20:07 -0700 |
commit | 67276589c883fe1a74d8d52057db1431d637dade (patch) | |
tree | dea80b87d7e11fb9a15c4b6e22c2c051e08eaf25 /OpenSim/Server | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-67276589c883fe1a74d8d52057db1431d637dade.zip opensim-SC_OLD-67276589c883fe1a74d8d52057db1431d637dade.tar.gz opensim-SC_OLD-67276589c883fe1a74d8d52057db1431d637dade.tar.bz2 opensim-SC_OLD-67276589c883fe1a74d8d52057db1431d637dade.tar.xz |
Changed IGridService to use the new GridRegion data structure instead of old SimpleRegionInfo.
Added grid configs to standalones.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs index 39c0584..e72c2eb 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | |||
@@ -38,6 +38,7 @@ using System.Xml.Serialization; | |||
38 | using System.Collections.Generic; | 38 | using System.Collections.Generic; |
39 | using OpenSim.Server.Base; | 39 | using OpenSim.Server.Base; |
40 | using OpenSim.Services.Interfaces; | 40 | using OpenSim.Services.Interfaces; |
41 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
41 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |
42 | using OpenSim.Framework.Servers.HttpServer; | 43 | using OpenSim.Framework.Servers.HttpServer; |
43 | using OpenMetaverse; | 44 | using OpenMetaverse; |
@@ -117,7 +118,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
117 | Dictionary<string, object> rinfoData = new Dictionary<string, object>(); | 118 | Dictionary<string, object> rinfoData = new Dictionary<string, object>(); |
118 | foreach (KeyValuePair<string, string> kvp in request) | 119 | foreach (KeyValuePair<string, string> kvp in request) |
119 | rinfoData[kvp.Key] = kvp.Value; | 120 | rinfoData[kvp.Key] = kvp.Value; |
120 | SimpleRegionInfo rinfo = new SimpleRegionInfo(rinfoData); | 121 | GridRegion rinfo = new GridRegion(rinfoData); |
121 | 122 | ||
122 | bool result = m_GridService.RegisterRegion(scopeID, rinfo); | 123 | bool result = m_GridService.RegisterRegion(scopeID, rinfo); |
123 | 124 | ||
@@ -158,11 +159,11 @@ namespace OpenSim.Server.Handlers.Grid | |||
158 | else | 159 | else |
159 | m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours"); | 160 | m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours"); |
160 | 161 | ||
161 | List<SimpleRegionInfo> rinfos = m_GridService.GetNeighbours(scopeID, regionID); | 162 | List<GridRegion> rinfos = m_GridService.GetNeighbours(scopeID, regionID); |
162 | 163 | ||
163 | Dictionary<string, object> result = new Dictionary<string, object>(); | 164 | Dictionary<string, object> result = new Dictionary<string, object>(); |
164 | int i = 0; | 165 | int i = 0; |
165 | foreach (SimpleRegionInfo rinfo in rinfos) | 166 | foreach (GridRegion rinfo in rinfos) |
166 | { | 167 | { |
167 | Dictionary<string, object> rinfoDict = rinfo.ToKeyValuePairs(); | 168 | Dictionary<string, object> rinfoDict = rinfo.ToKeyValuePairs(); |
168 | result["region" + i] = rinfoDict; | 169 | result["region" + i] = rinfoDict; |