diff options
author | Justin Clark-Casey (justincc) | 2012-11-24 02:43:31 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-24 02:43:31 +0000 |
commit | 82690e138448ebac6456ab03dcca4b0a8a1cc57a (patch) | |
tree | 0b5de164235b49d9d66f09582b857cd129d68b96 /OpenSim/Region/CoreModules/World/Land | |
parent | minor: Add some currently commented out debug log lines for investigating iss... (diff) | |
download | opensim-SC_OLD-82690e138448ebac6456ab03dcca4b0a8a1cc57a.zip opensim-SC_OLD-82690e138448ebac6456ab03dcca4b0a8a1cc57a.tar.gz opensim-SC_OLD-82690e138448ebac6456ab03dcca4b0a8a1cc57a.tar.bz2 opensim-SC_OLD-82690e138448ebac6456ab03dcca4b0a8a1cc57a.tar.xz |
Fix bug where loading an OAR with a deeded parcel would always set the parcel owner ID to the estate owner even if the group UUID was present.
Aims to address http://opensimulator.org/mantis/view.php?id=6355
As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records
(i.e. no membership data etc)
This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 8682798..7149aad 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1378,10 +1378,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1378 | 1378 | ||
1379 | public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data) | 1379 | public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data) |
1380 | { | 1380 | { |
1381 | // m_log.DebugFormat( | ||
1382 | // "[LAND MANAGMENT MODULE]: Processing {0} incoming parcels on {1}", data.Count, m_scene.Name); | ||
1383 | |||
1381 | for (int i = 0; i < data.Count; i++) | 1384 | for (int i = 0; i < data.Count; i++) |
1382 | { | ||
1383 | IncomingLandObjectFromStorage(data[i]); | 1385 | IncomingLandObjectFromStorage(data[i]); |
1384 | } | ||
1385 | } | 1386 | } |
1386 | 1387 | ||
1387 | public void IncomingLandObjectFromStorage(LandData data) | 1388 | public void IncomingLandObjectFromStorage(LandData data) |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 8829f27..5969d45 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -727,9 +727,10 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
727 | int ty = min_y * 4; | 727 | int ty = min_y * 4; |
728 | if (ty > ((int)Constants.RegionSize - 1)) | 728 | if (ty > ((int)Constants.RegionSize - 1)) |
729 | ty = ((int)Constants.RegionSize - 1); | 729 | ty = ((int)Constants.RegionSize - 1); |
730 | |||
730 | LandData.AABBMin = | 731 | LandData.AABBMin = |
731 | new Vector3((float) (min_x * 4), (float) (min_y * 4), | 732 | new Vector3( |
732 | (float) m_scene.Heightmap[tx, ty]); | 733 | (float)(min_x * 4), (float)(min_y * 4), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0); |
733 | 734 | ||
734 | tx = max_x * 4; | 735 | tx = max_x * 4; |
735 | if (tx > ((int)Constants.RegionSize - 1)) | 736 | if (tx > ((int)Constants.RegionSize - 1)) |
@@ -737,9 +738,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
737 | ty = max_y * 4; | 738 | ty = max_y * 4; |
738 | if (ty > ((int)Constants.RegionSize - 1)) | 739 | if (ty > ((int)Constants.RegionSize - 1)) |
739 | ty = ((int)Constants.RegionSize - 1); | 740 | ty = ((int)Constants.RegionSize - 1); |
740 | LandData.AABBMax = | 741 | |
741 | new Vector3((float) (max_x * 4), (float) (max_y * 4), | 742 | LandData.AABBMax |
742 | (float) m_scene.Heightmap[tx, ty]); | 743 | = new Vector3( |
744 | (float)(max_x * 4), (float)(max_y * 4), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0); | ||
745 | |||
743 | LandData.Area = tempArea; | 746 | LandData.Area = tempArea; |
744 | } | 747 | } |
745 | 748 | ||