diff options
| author | Melanie | 2009-10-02 19:04:46 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 19:04:46 +0100 |
| commit | 46955f42608ceb2b76731432f536e04e85521a12 (patch) | |
| tree | 37e8591bd95de33ad0c485626c6f40f7d4bd91b5 /OpenSim/ApplicationPlugins | |
| parent | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of... (diff) | |
| parent | Added a default for grid services in standalone. (diff) | |
| download | opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.zip opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.tar.gz opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.tar.bz2 opensim-SC_OLD-46955f42608ceb2b76731432f536e04e85521a12.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index ef45f73..f4e1db4 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -658,9 +658,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 658 | 658 | ||
| 659 | foreach (ILandObject parcel in parcels) | 659 | foreach (ILandObject parcel in parcels) |
| 660 | { | 660 | { |
| 661 | parcel.landData.Flags |= (uint) ParcelFlags.AllowVoiceChat; | 661 | parcel.LandData.Flags |= (uint) ParcelFlags.AllowVoiceChat; |
| 662 | parcel.landData.Flags |= (uint) ParcelFlags.UseEstateVoiceChan; | 662 | parcel.LandData.Flags |= (uint) ParcelFlags.UseEstateVoiceChan; |
| 663 | ((Scene)newscene).LandChannel.UpdateLandObject(parcel.landData.LocalID, parcel.landData); | 663 | ((Scene)newscene).LandChannel.UpdateLandObject(parcel.LandData.LocalID, parcel.LandData); |
| 664 | } | 664 | } |
| 665 | } | 665 | } |
| 666 | 666 | ||
| @@ -910,15 +910,15 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 910 | { | 910 | { |
| 911 | if (enableVoice) | 911 | if (enableVoice) |
| 912 | { | 912 | { |
| 913 | parcel.landData.Flags |= (uint)ParcelFlags.AllowVoiceChat; | 913 | parcel.LandData.Flags |= (uint)ParcelFlags.AllowVoiceChat; |
| 914 | parcel.landData.Flags |= (uint)ParcelFlags.UseEstateVoiceChan; | 914 | parcel.LandData.Flags |= (uint)ParcelFlags.UseEstateVoiceChan; |
| 915 | } | 915 | } |
| 916 | else | 916 | else |
| 917 | { | 917 | { |
| 918 | parcel.landData.Flags &= ~(uint)ParcelFlags.AllowVoiceChat; | 918 | parcel.LandData.Flags &= ~(uint)ParcelFlags.AllowVoiceChat; |
| 919 | parcel.landData.Flags &= ~(uint)ParcelFlags.UseEstateVoiceChan; | 919 | parcel.LandData.Flags &= ~(uint)ParcelFlags.UseEstateVoiceChan; |
| 920 | } | 920 | } |
| 921 | scene.LandChannel.UpdateLandObject(parcel.landData.LocalID, parcel.landData); | 921 | scene.LandChannel.UpdateLandObject(parcel.LandData.LocalID, parcel.LandData); |
| 922 | } | 922 | } |
| 923 | } | 923 | } |
| 924 | 924 | ||