diff options
| author | Melanie | 2012-03-29 00:27:35 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-29 00:27:35 +0100 |
| commit | 7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f (patch) | |
| tree | b09be52d5e7838b7c187c92f08f6c2bc73741a42 /OpenSim/Framework/LandData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add comment about setting client.SceneAgent in AddNewClient() (diff) | |
| download | opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.zip opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.gz opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.bz2 opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Framework/LandData.cs')
| -rw-r--r-- | OpenSim/Framework/LandData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 9a9a6bf..dcaa46d 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
| @@ -69,7 +69,7 @@ namespace OpenSim.Framework | |||
| 69 | (uint) ParcelFlags.AllowAPrimitiveEntry | | 69 | (uint) ParcelFlags.AllowAPrimitiveEntry | |
| 70 | (uint) ParcelFlags.AllowDeedToGroup | | 70 | (uint) ParcelFlags.AllowDeedToGroup | |
| 71 | (uint) ParcelFlags.CreateObjects | (uint) ParcelFlags.AllowOtherScripts | | 71 | (uint) ParcelFlags.CreateObjects | (uint) ParcelFlags.AllowOtherScripts | |
| 72 | (uint) ParcelFlags.SoundLocal; | 72 | (uint) ParcelFlags.SoundLocal | (uint) ParcelFlags.AllowVoiceChat; |
| 73 | 73 | ||
| 74 | private byte _landingType = 0; | 74 | private byte _landingType = 0; |
| 75 | private string _name = "Your Parcel"; | 75 | private string _name = "Your Parcel"; |