diff options
| author | Melanie | 2012-02-05 20:58:04 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-05 20:58:04 +0000 |
| commit | 54fc78013d1eb946551656849e7007427ef4aec3 (patch) | |
| tree | fae81b9031f5ae0fb07d0f3e61eb83946bbc26b1 /OpenSim/Region/CoreModules/World/Land | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revert my two quick fixes for the lag issue and put in the real fix, which (diff) | |
| download | opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.zip opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.gz opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.bz2 opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 3 |
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 | |||
| 1192 | foreach (LandAccessEntry entry in delete) | 1192 | foreach (LandAccessEntry entry in delete) |
| 1193 | LandData.ParcelAccessList.Remove(entry); | 1193 | LandData.ParcelAccessList.Remove(entry); |
| 1194 | 1194 | ||
| 1195 | m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this); | 1195 | if (delete.Count > 0) |
| 1196 | m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this); | ||
| 1196 | } | 1197 | } |
| 1197 | } | 1198 | } |
| 1198 | } | 1199 | } |