diff options
author | UbitUmarov | 2019-03-19 06:38:43 +0000 |
---|---|---|
committer | UbitUmarov | 2019-03-19 06:38:43 +0000 |
commit | 182977a872f837a29f936964d8df55942187261a (patch) | |
tree | 54fc103bb5ac6f504942e491b62a006c26935957 /OpenSim/Region/CoreModules | |
parent | ooops (diff) | |
download | opensim-SC-182977a872f837a29f936964d8df55942187261a.zip opensim-SC-182977a872f837a29f936964d8df55942187261a.tar.gz opensim-SC-182977a872f837a29f936964d8df55942187261a.tar.bz2 opensim-SC-182977a872f837a29f936964d8df55942187261a.tar.xz |
do not send parceloverlay on crossings (may be bad, or not)
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandChannel.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs index 993b782..eaa5292 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs | |||
@@ -247,11 +247,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
247 | m_landManagementModule.setParcelOtherCleanTime(remoteClient, localID, otherCleanTime); | 247 | m_landManagementModule.setParcelOtherCleanTime(remoteClient, localID, otherCleanTime); |
248 | } | 248 | } |
249 | } | 249 | } |
250 | public void sendClientInitialLandInfo(IClientAPI remoteClient) | 250 | public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay = true) |
251 | { | 251 | { |
252 | if (m_landManagementModule != null) | 252 | if (m_landManagementModule != null) |
253 | { | 253 | { |
254 | m_landManagementModule.sendClientInitialLandInfo(remoteClient); | 254 | m_landManagementModule.sendClientInitialLandInfo(remoteClient, overlay); |
255 | } | 255 | } |
256 | } | 256 | } |
257 | #endregion | 257 | #endregion |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index d693d21..c7b45ef 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -491,7 +491,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
491 | return; | 491 | return; |
492 | } | 492 | } |
493 | 493 | ||
494 | public void sendClientInitialLandInfo(IClientAPI remoteClient) | 494 | public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay = true) |
495 | { | 495 | { |
496 | ScenePresence avatar; | 496 | ScenePresence avatar; |
497 | 497 | ||
@@ -507,7 +507,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
507 | avatar.currentParcelUUID = over.LandData.GlobalID; | 507 | avatar.currentParcelUUID = over.LandData.GlobalID; |
508 | over.SendLandUpdateToClient(avatar.ControllingClient); | 508 | over.SendLandUpdateToClient(avatar.ControllingClient); |
509 | } | 509 | } |
510 | SendParcelOverlay(remoteClient); | 510 | if(overlay) |
511 | SendParcelOverlay(remoteClient); | ||
511 | } | 512 | } |
512 | 513 | ||
513 | public void SendLandUpdate(ScenePresence avatar, ILandObject over) | 514 | public void SendLandUpdate(ScenePresence avatar, ILandObject over) |