diff options
| author | Justin Clark-Casey (justincc) | 2010-10-22 23:35:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-10-22 23:35:07 +0100 |
| commit | 21187f459ea2ae590dda4249fa15ebf116d04fe0 (patch) | |
| tree | 48cfec3b73bdbf54f7bc22059044b92271deedc1 /OpenSim/Services/GridService/GridService.cs | |
| parent | Revert "* refactor refactor refactor ServerURI 4 lyfe" (diff) | |
| parent | Merge branch 'hg16' into mantis5110 (diff) | |
| download | opensim-SC-21187f459ea2ae590dda4249fa15ebf116d04fe0.zip opensim-SC-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.gz opensim-SC-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.bz2 opensim-SC-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.xz | |
Merge remote branch 'otakup0pe/mantis5110'
Diffstat (limited to 'OpenSim/Services/GridService/GridService.cs')
| -rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index e7988d6..125c2be 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
| @@ -479,7 +479,7 @@ namespace OpenSim.Services.GridService | |||
| 479 | OpenSim.Data.RegionFlags flags = (OpenSim.Data.RegionFlags)Convert.ToInt32(r.Data["flags"]); | 479 | OpenSim.Data.RegionFlags flags = (OpenSim.Data.RegionFlags)Convert.ToInt32(r.Data["flags"]); |
| 480 | MainConsole.Instance.Output(String.Format("{0,-20} {1}\n{2,-20} {3}\n{4,-39} {5}\n\n", | 480 | MainConsole.Instance.Output(String.Format("{0,-20} {1}\n{2,-20} {3}\n{4,-39} {5}\n\n", |
| 481 | r.RegionName, r.RegionID, | 481 | r.RegionName, r.RegionID, |
| 482 | String.Format("{0},{1}", r.posX, r.posY), "http://" + r.Data["serverIP"].ToString() + ":" + r.Data["serverPort"].ToString(), | 482 | String.Format("{0},{1}", r.posX, r.posY), r.Data["serverURI"], |
| 483 | r.Data["owner_uuid"].ToString(), flags.ToString())); | 483 | r.Data["owner_uuid"].ToString(), flags.ToString())); |
| 484 | } | 484 | } |
| 485 | return; | 485 | return; |