diff options
| author | Diva Canto | 2009-09-22 14:46:05 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-09-22 14:46:05 -0700 |
| commit | ffd30b8ac31bc408316079ba86076bf9e984a8be (patch) | |
| tree | 47c85aa445f21037576d6ce5e2df8f7477289343 /OpenSim/Services/GridService | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.zip opensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.tar.gz opensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.tar.bz2 opensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.tar.xz | |
Moved RegionName from RegionInfo to SimpleRegionInfo.
Diffstat (limited to 'OpenSim/Services/GridService')
| -rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index dd529f5..b37a51b 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
| @@ -179,7 +179,7 @@ namespace OpenSim.Services.GridService | |||
| 179 | rdata.posY = (int)rinfo.RegionLocY; | 179 | rdata.posY = (int)rinfo.RegionLocY; |
| 180 | rdata.RegionID = rinfo.RegionID; | 180 | rdata.RegionID = rinfo.RegionID; |
| 181 | rdata.Data = rinfo.ToKeyValuePairs(); | 181 | rdata.Data = rinfo.ToKeyValuePairs(); |
| 182 | //rdata.RegionName = rinfo.RegionName; | 182 | rdata.RegionName = rinfo.RegionName; |
| 183 | 183 | ||
| 184 | return rdata; | 184 | return rdata; |
| 185 | } | 185 | } |
| @@ -190,7 +190,7 @@ namespace OpenSim.Services.GridService | |||
| 190 | rinfo.RegionLocX = (uint)rdata.posX; | 190 | rinfo.RegionLocX = (uint)rdata.posX; |
| 191 | rinfo.RegionLocY = (uint)rdata.posY; | 191 | rinfo.RegionLocY = (uint)rdata.posY; |
| 192 | rinfo.RegionID = rdata.RegionID; | 192 | rinfo.RegionID = rdata.RegionID; |
| 193 | //rinfo.RegionName = rdata.RegionName; | 193 | rinfo.RegionName = rdata.RegionName; |
| 194 | 194 | ||
| 195 | return rinfo; | 195 | return rinfo; |
| 196 | } | 196 | } |