diff options
| author | Melanie | 2013-06-06 03:20:15 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-06 03:20:15 +0100 |
| commit | fe4a67efb6f54cad3f00884712abe03704216421 (patch) | |
| tree | 04de93aaa8e9430c7c33e15912b3683b0297a10a /OpenSim/Region/CoreModules/World/Land | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Update HTTP server (diff) | |
| download | opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.zip opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.gz opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.bz2 opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 317dfd8..dbc9296 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
| @@ -940,6 +940,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 940 | newLand.LandData.Name = newLand.LandData.Name; | 940 | newLand.LandData.Name = newLand.LandData.Name; |
| 941 | newLand.LandData.GlobalID = UUID.Random(); | 941 | newLand.LandData.GlobalID = UUID.Random(); |
| 942 | newLand.LandData.Dwell = 0; | 942 | newLand.LandData.Dwell = 0; |
| 943 | // Clear "Show in search" on the cut out parcel to prevent double-charging | ||
| 944 | newLand.LandData.Flags &= ~(uint)ParcelFlags.ShowDirectory; | ||
| 943 | 945 | ||
| 944 | newLand.SetLandBitmap(newLand.GetSquareLandBitmap(start_x, start_y, end_x, end_y)); | 946 | newLand.SetLandBitmap(newLand.GetSquareLandBitmap(start_x, start_y, end_x, end_y)); |
| 945 | 947 | ||