aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService/GridService.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-08-19 08:48:50 +0100
committerUbitUmarov2015-08-19 08:48:50 +0100
commit0b105da626ae8c2fb519a817b827f90534ed7d08 (patch)
tree509e6d091fb12f38fd09528335e51aeedbe59c08 /OpenSim/Services/GridService/GridService.cs
parentMerge branch 'master' into ubitworkmaster (diff)
parentvarregion: update MapImageServiceModule to upload multiple map tiles for larg... (diff)
downloadopensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.zip
opensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.gz
opensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.bz2
opensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.xz
Merge branch 'mbworkvar2' into ubitvar
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/GridService/GridService.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 76415ce..eb44dcb 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -655,7 +655,7 @@ namespace OpenSim.Services.GridService
655 return; 655 return;
656 } 656 }
657 657
658 RegionData region = m_Database.Get(x * (int)Constants.RegionSize, y * (int)Constants.RegionSize, UUID.Zero); 658 RegionData region = m_Database.Get((int)Util.RegionToWorldLoc((uint)x), (int)Util.RegionToWorldLoc((uint)y), UUID.Zero);
659 if (region == null) 659 if (region == null)
660 { 660 {
661 MainConsole.Instance.OutputFormat("No region found at {0},{1}", x, y); 661 MainConsole.Instance.OutputFormat("No region found at {0},{1}", x, y);
@@ -673,6 +673,7 @@ namespace OpenSim.Services.GridService
673 dispList.AddRow("Region Name", r.RegionName); 673 dispList.AddRow("Region Name", r.RegionName);
674 dispList.AddRow("Region ID", r.RegionID); 674 dispList.AddRow("Region ID", r.RegionID);
675 dispList.AddRow("Location", string.Format("{0},{1}", r.coordX, r.coordY)); 675 dispList.AddRow("Location", string.Format("{0},{1}", r.coordX, r.coordY));
676 dispList.AddRow("Size", string.Format("{0}x{1}", r.sizeX, r.sizeY));
676 dispList.AddRow("URI", r.Data["serverURI"]); 677 dispList.AddRow("URI", r.Data["serverURI"]);
677 dispList.AddRow("Owner ID", r.Data["owner_uuid"]); 678 dispList.AddRow("Owner ID", r.Data["owner_uuid"]);
678 dispList.AddRow("Flags", flags); 679 dispList.AddRow("Flags", flags);