aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
diff options
context:
space:
mode:
authorMelanie2012-06-07 23:34:22 +0100
committerMelanie2012-06-07 23:34:22 +0100
commit69dd5b855adb8178cc1057a645a2a6d433c2dc0f (patch)
tree392a996bd1aeab76743288fcfd7300a1a58faac1 /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
parentMerge branch 'master' into careminster (diff)
parentImplement playing of the real collision sounds, change scaling for avatar (diff)
downloadopensim-SC_OLD-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.zip
opensim-SC_OLD-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.gz
opensim-SC_OLD-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.bz2
opensim-SC_OLD-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 2fa0b3f..51dcb67 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1101,8 +1101,11 @@ namespace OpenSim.Region.CoreModules.World.Land
1101 { 1101 {
1102 if (!temp.Contains(currentParcel)) 1102 if (!temp.Contains(currentParcel))
1103 { 1103 {
1104 currentParcel.ForceUpdateLandInfo(); 1104 if (!currentParcel.IsEitherBannedOrRestricted(remote_client.AgentId))
1105 temp.Add(currentParcel); 1105 {
1106 currentParcel.ForceUpdateLandInfo();
1107 temp.Add(currentParcel);
1108 }
1106 } 1109 }
1107 } 1110 }
1108 } 1111 }