diff options
author | UbitUmarov | 2014-09-30 03:31:04 +0100 |
---|---|---|
committer | UbitUmarov | 2014-09-30 03:31:04 +0100 |
commit | f117a86c87f0868cb6ddbc29f341a3a75290c2a0 (patch) | |
tree | b4e6cac4fae1140617df4762e40ad36b0f863719 /OpenSim/Region/CoreModules/World/Land | |
parent | keep same animation if in transit (diff) | |
download | opensim-SC_OLD-f117a86c87f0868cb6ddbc29f341a3a75290c2a0.zip opensim-SC_OLD-f117a86c87f0868cb6ddbc29f341a3a75290c2a0.tar.gz opensim-SC_OLD-f117a86c87f0868cb6ddbc29f341a3a75290c2a0.tar.bz2 opensim-SC_OLD-f117a86c87f0868cb6ddbc29f341a3a75290c2a0.tar.xz |
fix musicURL change being sent back with wrong snap_selection, and not
sent to other avatars.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index c8555ab..bbb280b 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 | |||
1200 | { | 1200 | { |
1201 | //the proprieties to who changed them | 1201 | //the proprieties to who changed them |
1202 | 1202 | ||
1203 | land.SendLandProperties(0, true, LandChannel.LAND_RESULT_SINGLE, remote_client); | 1203 | land.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, remote_client); |
1204 | 1204 | ||
1205 | if (needOverlay) | 1205 | UUID parcelID = land.LandData.GlobalID; |
1206 | { | 1206 | m_scene.ForEachScenePresence(delegate(ScenePresence avatar) |
1207 | UUID parcelID = land.LandData.GlobalID; | 1207 | { |
1208 | m_scene.ForEachScenePresence(delegate(ScenePresence avatar) | 1208 | if (avatar.IsDeleted || avatar.isNPC) |
1209 | { | 1209 | return; |
1210 | if (avatar.IsDeleted || avatar.isNPC) | ||
1211 | return; | ||
1212 | 1210 | ||
1213 | IClientAPI client = avatar.ControllingClient; | 1211 | IClientAPI client = avatar.ControllingClient; |
1212 | if (needOverlay) | ||
1214 | SendParcelOverlay(client); | 1213 | SendParcelOverlay(client); |
1215 | 1214 | ||
1216 | if (avatar.IsChildAgent) | 1215 | if (avatar.IsChildAgent) |
1217 | return; | 1216 | return; |
1218 | 1217 | ||
1219 | ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 1218 | ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
1220 | if (aland != null) | 1219 | if (aland != null) |
1221 | { | 1220 | { |
1222 | if (client != remote_client || land != aland) | 1221 | if (client != remote_client || land != aland) |
1223 | aland.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, client); | 1222 | aland.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, client); |
1224 | } | 1223 | } |
1225 | if (avatar.currentParcelUUID == parcelID) | 1224 | if (avatar.currentParcelUUID == parcelID) |
1226 | avatar.currentParcelUUID = parcelID; // force parcel flags review | 1225 | avatar.currentParcelUUID = parcelID; // force parcel flags review |
1227 | }); | 1226 | }); |
1228 | } | ||
1229 | } | 1227 | } |
1230 | } | 1228 | } |
1231 | 1229 | ||