diff options
author | Melanie Thielker | 2010-09-06 03:59:48 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-09-06 03:59:48 +0200 |
commit | 00a23eea0ec5d3607cf9cd021a3a182da258686e (patch) | |
tree | 012e54645dfb70c67e4af2912526b347c4bbf593 /OpenSim/Region/CoreModules | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-00a23eea0ec5d3607cf9cd021a3a182da258686e.zip opensim-SC-00a23eea0ec5d3607cf9cd021a3a182da258686e.tar.gz opensim-SC-00a23eea0ec5d3607cf9cd021a3a182da258686e.tar.bz2 opensim-SC-00a23eea0ec5d3607cf9cd021a3a182da258686e.tar.xz |
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
modules need to see it (Search!) even if it comes in via CAPS
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 040dc8c..f62ec1b 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1115,7 +1115,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1115 | m_landList.TryGetValue(localID, out land); | 1115 | m_landList.TryGetValue(localID, out land); |
1116 | } | 1116 | } |
1117 | 1117 | ||
1118 | if (land != null) land.UpdateLandProperties(args, remote_client); | 1118 | if (land != null) |
1119 | { | ||
1120 | land.UpdateLandProperties(args, remote_client); | ||
1121 | m_scene.EventManager.TriggerOnParcelPropertiesUpdateRequest(args, localID, remote_client); | ||
1122 | } | ||
1119 | } | 1123 | } |
1120 | 1124 | ||
1121 | public void ClientOnParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client) | 1125 | public void ClientOnParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client) |
@@ -1433,9 +1437,13 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1433 | m_landList.TryGetValue(parcelID, out land); | 1437 | m_landList.TryGetValue(parcelID, out land); |
1434 | } | 1438 | } |
1435 | 1439 | ||
1436 | if (land != null) { | 1440 | if (land != null) |
1441 | { | ||
1437 | land.UpdateLandProperties(land_update, client); | 1442 | land.UpdateLandProperties(land_update, client); |
1438 | } else { | 1443 | m_scene.EventManager.TriggerOnParcelPropertiesUpdateRequest(land_update, parcelID, client); |
1444 | } | ||
1445 | else | ||
1446 | { | ||
1439 | m_log.WarnFormat("[LAND] unable to find parcelID {0}", parcelID); | 1447 | m_log.WarnFormat("[LAND] unable to find parcelID {0}", parcelID); |
1440 | } | 1448 | } |
1441 | return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty()); | 1449 | return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty()); |