aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
diff options
context:
space:
mode:
authorMelanie2012-10-23 17:23:36 +0100
committerMelanie2012-10-23 17:23:36 +0100
commit13cef0b16adabee46689dab69beec9a8ec813221 (patch)
tree62ca6d661b1b2345e5b92889b136e77f776508db /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
parentMerge branch 'master' into careminster (diff)
parentRefactor: Move Dwell reply to a module that can be disabled. The prior, (diff)
downloadopensim-SC_OLD-13cef0b16adabee46689dab69beec9a8ec813221.zip
opensim-SC_OLD-13cef0b16adabee46689dab69beec9a8ec813221.tar.gz
opensim-SC_OLD-13cef0b16adabee46689dab69beec9a8ec813221.tar.bz2
opensim-SC_OLD-13cef0b16adabee46689dab69beec9a8ec813221.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Framework/LandData.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index aae6603..b5e2bc3 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -927,6 +927,7 @@ namespace OpenSim.Region.CoreModules.World.Land
927 ILandObject newLand = startLandObject.Copy(); 927 ILandObject newLand = startLandObject.Copy();
928 newLand.LandData.Name = newLand.LandData.Name; 928 newLand.LandData.Name = newLand.LandData.Name;
929 newLand.LandData.GlobalID = UUID.Random(); 929 newLand.LandData.GlobalID = UUID.Random();
930 newLand.LandData.Dwell = 0;
930 931
931 newLand.SetLandBitmap(newLand.GetSquareLandBitmap(start_x, start_y, end_x, end_y)); 932 newLand.SetLandBitmap(newLand.GetSquareLandBitmap(start_x, start_y, end_x, end_y));
932 933