From f117a86c87f0868cb6ddbc29f341a3a75290c2a0 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 30 Sep 2014 03:31:04 +0100 Subject: [PATCH] fix musicURL change being sent back with wrong snap_selection, and not sent to other avatars. --- .../World/Land/LandManagementModule.cs | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index c8555abcc3..bbb280bbdb 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -1200,32 +1200,30 @@ namespace OpenSim.Region.CoreModules.World.Land { //the proprieties to who changed them - land.SendLandProperties(0, true, LandChannel.LAND_RESULT_SINGLE, remote_client); + land.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, remote_client); - if (needOverlay) - { - UUID parcelID = land.LandData.GlobalID; - m_scene.ForEachScenePresence(delegate(ScenePresence avatar) - { - if (avatar.IsDeleted || avatar.isNPC) - return; + UUID parcelID = land.LandData.GlobalID; + m_scene.ForEachScenePresence(delegate(ScenePresence avatar) + { + if (avatar.IsDeleted || avatar.isNPC) + return; - IClientAPI client = avatar.ControllingClient; + IClientAPI client = avatar.ControllingClient; + if (needOverlay) SendParcelOverlay(client); - if (avatar.IsChildAgent) - return; - - ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); - if (aland != null) - { - if (client != remote_client || land != aland) - aland.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, client); - } - if (avatar.currentParcelUUID == parcelID) - avatar.currentParcelUUID = parcelID; // force parcel flags review - }); - } + if (avatar.IsChildAgent) + return; + + ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); + if (aland != null) + { + if (client != remote_client || land != aland) + aland.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, client); + } + if (avatar.currentParcelUUID == parcelID) + avatar.currentParcelUUID = parcelID; // force parcel flags review + }); } }