diff options
author | Robert Adams | 2013-09-19 12:14:21 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-25 17:30:45 -0700 |
commit | 96abbbb6fbab56e29c8a8af6974ef1df90e45ddf (patch) | |
tree | a077759f6c3563ef86c13f7a06fae549f4577b4b /OpenSim/Region/CoreModules/World | |
parent | minor: Comment out windlight log message about sending scene data for now. (diff) | |
download | opensim-SC_OLD-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.zip opensim-SC_OLD-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.tar.gz opensim-SC_OLD-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.tar.bz2 opensim-SC_OLD-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.tar.xz |
VarRegion: change RegionInfo storage of region coordinates from region
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
Diffstat (limited to '')
6 files changed, 29 insertions, 29 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs index d8dace2..9aa4243 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs | |||
@@ -71,8 +71,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
71 | 71 | ||
72 | public void AddScene(Scene scene) | 72 | public void AddScene(Scene scene) |
73 | { | 73 | { |
74 | uint x = scene.RegionInfo.RegionLocX; | 74 | uint x = scene.RegionInfo.LegacyRegionLocX; |
75 | uint y = scene.RegionInfo.RegionLocY; | 75 | uint y = scene.RegionInfo.LegacyRegionLocY; |
76 | 76 | ||
77 | SortedDictionary<uint, Scene> row; | 77 | SortedDictionary<uint, Scene> row; |
78 | if (!Regions.TryGetValue(y, out row)) | 78 | if (!Regions.TryGetValue(y, out row)) |
@@ -120,8 +120,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
120 | { | 120 | { |
121 | // We add the region's coordinates to ensure uniqueness even if multiple regions have the same name | 121 | // We add the region's coordinates to ensure uniqueness even if multiple regions have the same name |
122 | string path = string.Format("{0}_{1}_{2}", | 122 | string path = string.Format("{0}_{1}_{2}", |
123 | scene.RegionInfo.RegionLocX - Rect.X + 1, | 123 | scene.RegionInfo.LegacyRegionLocX - Rect.X + 1, |
124 | scene.RegionInfo.RegionLocY - Rect.Y + 1, | 124 | scene.RegionInfo.LegacyRegionLocY - Rect.Y + 1, |
125 | scene.RegionInfo.RegionName.Replace(' ', '_')); | 125 | scene.RegionInfo.RegionName.Replace(' ', '_')); |
126 | m_regionDirs[scene.RegionInfo.RegionID] = path; | 126 | m_regionDirs[scene.RegionInfo.RegionID] = path; |
127 | }); | 127 | }); |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs index 3dcc020..25f1e5c 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs | |||
@@ -145,7 +145,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
145 | { | 145 | { |
146 | foreach (RegionInfo archivedRegion in m_directory2region.Values) | 146 | foreach (RegionInfo archivedRegion in m_directory2region.Values) |
147 | { | 147 | { |
148 | Point location = new Point((int)rootScene.RegionInfo.RegionLocX, (int)rootScene.RegionInfo.RegionLocY); | 148 | Point location = new Point((int)rootScene.RegionInfo.LegacyRegionLocX, (int)rootScene.RegionInfo.LegacyRegionLocY); |
149 | location.Offset(archivedRegion.Location); | 149 | location.Offset(archivedRegion.Location); |
150 | 150 | ||
151 | Scene scene; | 151 | Scene scene; |
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs index 173b603..bc172a4 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs | |||
@@ -96,9 +96,9 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
96 | int x = (args.Length > 5 ? int.Parse(args[5]) : -1); | 96 | int x = (args.Length > 5 ? int.Parse(args[5]) : -1); |
97 | int y = (args.Length > 6 ? int.Parse(args[6]) : -1); | 97 | int y = (args.Length > 6 ? int.Parse(args[6]) : -1); |
98 | 98 | ||
99 | if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x) | 99 | if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) |
100 | { | 100 | { |
101 | if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y) | 101 | if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) |
102 | { | 102 | { |
103 | int corner = int.Parse(num); | 103 | int corner = int.Parse(num); |
104 | UUID texture = UUID.Parse(uuid); | 104 | UUID texture = UUID.Parse(uuid); |
@@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
135 | int x = (args.Length > 4 ? int.Parse(args[4]) : -1); | 135 | int x = (args.Length > 4 ? int.Parse(args[4]) : -1); |
136 | int y = (args.Length > 5 ? int.Parse(args[5]) : -1); | 136 | int y = (args.Length > 5 ? int.Parse(args[5]) : -1); |
137 | 137 | ||
138 | if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x) | 138 | if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) |
139 | { | 139 | { |
140 | if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y) | 140 | if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) |
141 | { | 141 | { |
142 | double selectedheight = double.Parse(heightstring); | 142 | double selectedheight = double.Parse(heightstring); |
143 | 143 | ||
@@ -159,9 +159,9 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
159 | int x = (args.Length > 6 ? int.Parse(args[6]) : -1); | 159 | int x = (args.Length > 6 ? int.Parse(args[6]) : -1); |
160 | int y = (args.Length > 7 ? int.Parse(args[7]) : -1); | 160 | int y = (args.Length > 7 ? int.Parse(args[7]) : -1); |
161 | 161 | ||
162 | if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x) | 162 | if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) |
163 | { | 163 | { |
164 | if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y) | 164 | if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) |
165 | { | 165 | { |
166 | int corner = int.Parse(num); | 166 | int corner = int.Parse(num); |
167 | float lowValue = float.Parse(min, Culture.NumberFormatInfo); | 167 | float lowValue = float.Parse(min, Culture.NumberFormatInfo); |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 1789d6d..51ed83f 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1717,8 +1717,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1717 | // HACK for now | 1717 | // HACK for now |
1718 | RegionInfo r = new RegionInfo(); | 1718 | RegionInfo r = new RegionInfo(); |
1719 | r.RegionName = info.RegionName; | 1719 | r.RegionName = info.RegionName; |
1720 | r.RegionLocX = (uint)info.RegionLocX; | 1720 | r.LegacyRegionLocX = (uint)info.RegionLocX; |
1721 | r.RegionLocY = (uint)info.RegionLocY; | 1721 | r.LegacyRegionLocY = (uint)info.RegionLocY; |
1722 | r.RegionSettings.Maturity = (int)Util.ConvertAccessLevelToMaturity(data.RegionAccess); | 1722 | r.RegionSettings.Maturity = (int)Util.ConvertAccessLevelToMaturity(data.RegionAccess); |
1723 | remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y); | 1723 | remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y); |
1724 | } | 1724 | } |
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index fd30c46..c1ffd22 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
@@ -553,8 +553,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
553 | /// <param name="fileStartY">Where to begin our slice</param> | 553 | /// <param name="fileStartY">Where to begin our slice</param> |
554 | public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) | 554 | public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) |
555 | { | 555 | { |
556 | int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX; | 556 | int offsetX = (int) m_scene.RegionInfo.LegacyRegionLocX - fileStartX; |
557 | int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY; | 557 | int offsetY = (int) m_scene.RegionInfo.LegacyRegionLocY - fileStartY; |
558 | 558 | ||
559 | if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight) | 559 | if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight) |
560 | { | 560 | { |
@@ -594,14 +594,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
594 | /// <param name="fileStartY">The may y co-ordinate at which to begin the save.</param> | 594 | /// <param name="fileStartY">The may y co-ordinate at which to begin the save.</param> |
595 | public void SaveToFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) | 595 | public void SaveToFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) |
596 | { | 596 | { |
597 | int offsetX = (int)m_scene.RegionInfo.RegionLocX - fileStartX; | 597 | int offsetX = (int)m_scene.RegionInfo.LegacyRegionLocX - fileStartX; |
598 | int offsetY = (int)m_scene.RegionInfo.RegionLocY - fileStartY; | 598 | int offsetY = (int)m_scene.RegionInfo.LegacyRegionLocY - fileStartY; |
599 | 599 | ||
600 | if (offsetX < 0 || offsetX >= fileWidth || offsetY < 0 || offsetY >= fileHeight) | 600 | if (offsetX < 0 || offsetX >= fileWidth || offsetY < 0 || offsetY >= fileHeight) |
601 | { | 601 | { |
602 | MainConsole.Instance.OutputFormat( | 602 | MainConsole.Instance.OutputFormat( |
603 | "ERROR: file width + minimum X tile and file height + minimum Y tile must incorporate the current region at ({0},{1}). File width {2} from {3} and file height {4} from {5} does not.", | 603 | "ERROR: file width + minimum X tile and file height + minimum Y tile must incorporate the current region at ({0},{1}). File width {2} from {3} and file height {4} from {5} does not.", |
604 | m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, fileWidth, fileStartX, fileHeight, fileStartY); | 604 | m_scene.RegionInfo.LegacyRegionLocX, m_scene.RegionInfo.LegacyRegionLocY, fileWidth, fileStartX, fileHeight, fileStartY); |
605 | 605 | ||
606 | return; | 606 | return; |
607 | } | 607 | } |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index a26a5f0..c985ca2 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
240 | // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is | 240 | // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is |
241 | // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks. | 241 | // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks. |
242 | 242 | ||
243 | if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048) | 243 | if (m_scene.RegionInfo.LegacyRegionLocX >= 2048 || m_scene.RegionInfo.LegacyRegionLocY >= 2048) |
244 | { | 244 | { |
245 | ScenePresence avatarPresence = null; | 245 | ScenePresence avatarPresence = null; |
246 | 246 | ||
@@ -269,10 +269,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
269 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); ; | 269 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); ; |
270 | 270 | ||
271 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 271 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
272 | (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize, | 272 | (int)(m_scene.RegionInfo.LegacyRegionLocX - 8) * (int)Constants.RegionSize, |
273 | (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize, | 273 | (int)(m_scene.RegionInfo.LegacyRegionLocX + 8) * (int)Constants.RegionSize, |
274 | (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize, | 274 | (int)(m_scene.RegionInfo.LegacyRegionLocY - 8) * (int)Constants.RegionSize, |
275 | (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize); | 275 | (int)(m_scene.RegionInfo.LegacyRegionLocY + 8) * (int)Constants.RegionSize); |
276 | foreach (GridRegion r in regions) | 276 | foreach (GridRegion r in regions) |
277 | { | 277 | { |
278 | MapBlockData block = new MapBlockData(); | 278 | MapBlockData block = new MapBlockData(); |
@@ -1199,10 +1199,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1199 | 1199 | ||
1200 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); | 1200 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); |
1201 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 1201 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
1202 | (int)(m_scene.RegionInfo.RegionLocX - 9) * (int)Constants.RegionSize, | 1202 | (int)(m_scene.RegionInfo.LegacyRegionLocX - 9) * (int)Constants.RegionSize, |
1203 | (int)(m_scene.RegionInfo.RegionLocX + 9) * (int)Constants.RegionSize, | 1203 | (int)(m_scene.RegionInfo.LegacyRegionLocX + 9) * (int)Constants.RegionSize, |
1204 | (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize, | 1204 | (int)(m_scene.RegionInfo.LegacyRegionLocY - 9) * (int)Constants.RegionSize, |
1205 | (int)(m_scene.RegionInfo.RegionLocY + 9) * (int)Constants.RegionSize); | 1205 | (int)(m_scene.RegionInfo.LegacyRegionLocY + 9) * (int)Constants.RegionSize); |
1206 | List<AssetBase> textures = new List<AssetBase>(); | 1206 | List<AssetBase> textures = new List<AssetBase>(); |
1207 | List<Image> bitImages = new List<Image>(); | 1207 | List<Image> bitImages = new List<Image>(); |
1208 | 1208 | ||
@@ -1243,8 +1243,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1243 | 1243 | ||
1244 | for (int i = 0; i < mapBlocks.Count; i++) | 1244 | for (int i = 0; i < mapBlocks.Count; i++) |
1245 | { | 1245 | { |
1246 | ushort x = (ushort)((mapBlocks[i].X - m_scene.RegionInfo.RegionLocX) + 10); | 1246 | ushort x = (ushort)((mapBlocks[i].X - m_scene.RegionInfo.LegacyRegionLocX) + 10); |
1247 | ushort y = (ushort)((mapBlocks[i].Y - m_scene.RegionInfo.RegionLocY) + 10); | 1247 | ushort y = (ushort)((mapBlocks[i].Y - m_scene.RegionInfo.LegacyRegionLocY) + 10); |
1248 | g.DrawImage(bitImages[i], (x * 128), 2560 - (y * 128), 128, 128); // y origin is top | 1248 | g.DrawImage(bitImages[i], (x * 128), 2560 - (y * 128), 128, 128); // y origin is top |
1249 | } | 1249 | } |
1250 | 1250 | ||