Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index debf6d2..91aa228 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -1192,7 +1192,8 @@ namespace OpenSim.Region.CoreModules.World.Land
             foreach (LandAccessEntry entry in delete)
                 LandData.ParcelAccessList.Remove(entry);
 
-            m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this);
+            if (delete.Count > 0)
+                m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this);
         }
     }
 }