diff options
author | Melanie | 2010-11-09 23:54:08 +0000 |
---|---|---|
committer | Melanie | 2010-11-09 23:55:43 +0000 |
commit | 846198bb9ef6aec8a3f351de8ef4393d6b7f35bd (patch) | |
tree | 4b1102a22a91e5859d8457458af9a22efdaf453b /OpenSim | |
parent | Fix parcel bans to work only on the avatars they're supposed to work on inste... (diff) | |
download | opensim-SC-846198bb9ef6aec8a3f351de8ef4393d6b7f35bd.zip opensim-SC-846198bb9ef6aec8a3f351de8ef4393d6b7f35bd.tar.gz opensim-SC-846198bb9ef6aec8a3f351de8ef4393d6b7f35bd.tar.bz2 opensim-SC-846198bb9ef6aec8a3f351de8ef4393d6b7f35bd.tar.xz |
Although the Allow Voice setting is per estate rather than per region,
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 1bf0d67..6844c60 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -1098,12 +1098,14 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1098 | if (m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide) | 1098 | if (m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide) |
1099 | flags |= RegionFlags.AllowParcelChanges; | 1099 | flags |= RegionFlags.AllowParcelChanges; |
1100 | if (m_scene.RegionInfo.RegionSettings.BlockShowInSearch) | 1100 | if (m_scene.RegionInfo.RegionSettings.BlockShowInSearch) |
1101 | flags |= (RegionFlags)(1 << 29); | 1101 | flags |= RegionFlags.BlockParcelSearch; |
1102 | 1102 | ||
1103 | if (m_scene.RegionInfo.RegionSettings.FixedSun) | 1103 | if (m_scene.RegionInfo.RegionSettings.FixedSun) |
1104 | flags |= RegionFlags.SunFixed; | 1104 | flags |= RegionFlags.SunFixed; |
1105 | if (m_scene.RegionInfo.RegionSettings.Sandbox) | 1105 | if (m_scene.RegionInfo.RegionSettings.Sandbox) |
1106 | flags |= RegionFlags.Sandbox; | 1106 | flags |= RegionFlags.Sandbox; |
1107 | if (m_scene.RegionInfo.EstateSettings.AllowVoice) | ||
1108 | flags |= RegionFlags.AllowVoice; | ||
1107 | 1109 | ||
1108 | // Fudge these to always on, so the menu options activate | 1110 | // Fudge these to always on, so the menu options activate |
1109 | // | 1111 | // |