diff options
author | Melanie Thielker | 2010-08-07 05:45:52 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-08-07 05:45:52 +0200 |
commit | c554de75010a442753cce29ee06d2b60d7b4701a (patch) | |
tree | 10714d66217de4a3fd77373407586bf041f1869c /OpenSim/Region/CoreModules/World/Land | |
parent | Change the (hackish) constant to match the changed enum for attachs (diff) | |
download | opensim-SC-c554de75010a442753cce29ee06d2b60d7b4701a.zip opensim-SC-c554de75010a442753cce29ee06d2b60d7b4701a.tar.gz opensim-SC-c554de75010a442753cce29ee06d2b60d7b4701a.tar.bz2 opensim-SC-c554de75010a442753cce29ee06d2b60d7b4701a.tar.xz |
Correct display of landmark about info. Also correct region maturity rating
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index cfee1b0..7e29a56 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -51,6 +51,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
51 | public LandData LandData; | 51 | public LandData LandData; |
52 | public ulong RegionHandle; | 52 | public ulong RegionHandle; |
53 | public uint X, Y; | 53 | public uint X, Y; |
54 | public byte RegionAccess; | ||
54 | } | 55 | } |
55 | 56 | ||
56 | public class LandManagementModule : INonSharedRegionModule | 57 | public class LandManagementModule : INonSharedRegionModule |
@@ -1484,13 +1485,15 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1484 | if (extLandData.RegionHandle == m_scene.RegionInfo.RegionHandle) | 1485 | if (extLandData.RegionHandle == m_scene.RegionInfo.RegionHandle) |
1485 | { | 1486 | { |
1486 | extLandData.LandData = this.GetLandObject(extLandData.X, extLandData.Y).LandData; | 1487 | extLandData.LandData = this.GetLandObject(extLandData.X, extLandData.Y).LandData; |
1488 | extLandData.RegionAccess = m_scene.RegionInfo.AccessLevel; | ||
1487 | } | 1489 | } |
1488 | else | 1490 | else |
1489 | { | 1491 | { |
1490 | ILandService landService = m_scene.RequestModuleInterface<ILandService>(); | 1492 | ILandService landService = m_scene.RequestModuleInterface<ILandService>(); |
1491 | extLandData.LandData = landService.GetLandData(extLandData.RegionHandle, | 1493 | extLandData.LandData = landService.GetLandData(extLandData.RegionHandle, |
1492 | extLandData.X, | 1494 | extLandData.X, |
1493 | extLandData.Y); | 1495 | extLandData.Y, |
1496 | out extLandData.RegionAccess); | ||
1494 | if (extLandData.LandData == null) | 1497 | if (extLandData.LandData == null) |
1495 | { | 1498 | { |
1496 | // we didn't find the region/land => don't cache | 1499 | // we didn't find the region/land => don't cache |
@@ -1522,6 +1525,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1522 | r.RegionName = info.RegionName; | 1525 | r.RegionName = info.RegionName; |
1523 | r.RegionLocX = (uint)info.RegionLocX; | 1526 | r.RegionLocX = (uint)info.RegionLocX; |
1524 | r.RegionLocY = (uint)info.RegionLocY; | 1527 | r.RegionLocY = (uint)info.RegionLocY; |
1528 | r.RegionSettings.Maturity = (int)Util.ConvertAccessLevelToMaturity(data.RegionAccess); | ||
1525 | remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y); | 1529 | remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y); |
1526 | } | 1530 | } |
1527 | else | 1531 | else |