diff options
author | dahlia | 2010-10-20 20:43:08 -0700 |
---|---|---|
committer | dahlia | 2010-10-20 20:43:08 -0700 |
commit | f8a47801ee9421282eb3abc3e89a465fc71f6930 (patch) | |
tree | 1309c1db63355ee56f719e0fabe81278f3ef47b4 /OpenSim/Services/GridService/GridService.cs | |
parent | fix combining of multiple physics submeshes (diff) | |
parent | * remove some spurious debug info (diff) | |
download | opensim-SC_OLD-f8a47801ee9421282eb3abc3e89a465fc71f6930.zip opensim-SC_OLD-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.gz opensim-SC_OLD-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.bz2 opensim-SC_OLD-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.xz |
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
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; |