diff options
author | Diva Canto | 2009-09-24 18:23:55 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-24 18:23:55 -0700 |
commit | 6a5d7650d02979c74abcbbb3595729a4a6b55411 (patch) | |
tree | 85271d3382223cc9a851309dd707be127554da47 /OpenSim/Services/GridService/GridService.cs | |
parent | GridServerPostHandler finished. GridClient tests all work. More guards on get... (diff) | |
download | opensim-SC-6a5d7650d02979c74abcbbb3595729a4a6b55411.zip opensim-SC-6a5d7650d02979c74abcbbb3595729a4a6b55411.tar.gz opensim-SC-6a5d7650d02979c74abcbbb3595729a4a6b55411.tar.bz2 opensim-SC-6a5d7650d02979c74abcbbb3595729a4a6b55411.tar.xz |
All tests pass for MySQL/MySQLRegionData.
Added OpenSim.GridServer.ini.example that I have been using for testing the ROBUST grid service with the GridClient.
Diffstat (limited to 'OpenSim/Services/GridService/GridService.cs')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 01ffa1d..41344ad 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -183,9 +183,9 @@ namespace OpenSim.Services.GridService | |||
183 | rdata.posX = (int)rinfo.RegionLocX; | 183 | rdata.posX = (int)rinfo.RegionLocX; |
184 | rdata.posY = (int)rinfo.RegionLocY; | 184 | rdata.posY = (int)rinfo.RegionLocY; |
185 | rdata.RegionID = rinfo.RegionID; | 185 | rdata.RegionID = rinfo.RegionID; |
186 | rdata.Data = rinfo.ToKeyValuePairs(); | ||
187 | rdata.RegionName = rinfo.RegionName; | 186 | rdata.RegionName = rinfo.RegionName; |
188 | 187 | rdata.Data = rinfo.ToKeyValuePairs(); | |
188 | rdata.Data["regionHandle"] = Utils.UIntsToLong((uint)rdata.posX, (uint)rdata.posY); | ||
189 | return rdata; | 189 | return rdata; |
190 | } | 190 | } |
191 | 191 | ||
@@ -196,6 +196,7 @@ namespace OpenSim.Services.GridService | |||
196 | rinfo.RegionLocY = rdata.posY; | 196 | rinfo.RegionLocY = rdata.posY; |
197 | rinfo.RegionID = rdata.RegionID; | 197 | rinfo.RegionID = rdata.RegionID; |
198 | rinfo.RegionName = rdata.RegionName; | 198 | rinfo.RegionName = rdata.RegionName; |
199 | rinfo.ScopeID = rdata.ScopeID; | ||
199 | 200 | ||
200 | return rinfo; | 201 | return rinfo; |
201 | } | 202 | } |