aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-11-09 23:54:08 +0000
committerMelanie2010-11-09 23:54:08 +0000
commitfa64f2e56e6f3375c1417172b134eacb1a00f16c (patch)
treef6484697ce363dc235b0aa3131d39ebe7b0d23d1 /OpenSim
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-fa64f2e56e6f3375c1417172b134eacb1a00f16c.zip
opensim-SC-fa64f2e56e6f3375c1417172b134eacb1a00f16c.tar.gz
opensim-SC-fa64f2e56e6f3375c1417172b134eacb1a00f16c.tar.bz2
opensim-SC-fa64f2e56e6f3375c1417172b134eacb1a00f16c.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 '')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs4
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 9df13d8..ab142f7 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1115,12 +1115,14 @@ namespace OpenSim.Region.CoreModules.World.Estate
1115 if (m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide) 1115 if (m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide)
1116 flags |= RegionFlags.AllowParcelChanges; 1116 flags |= RegionFlags.AllowParcelChanges;
1117 if (m_scene.RegionInfo.RegionSettings.BlockShowInSearch) 1117 if (m_scene.RegionInfo.RegionSettings.BlockShowInSearch)
1118 flags |= (RegionFlags)(1 << 29); 1118 flags |= RegionFlags.BlockParcelSearch;
1119 1119
1120 if (m_scene.RegionInfo.RegionSettings.FixedSun) 1120 if (m_scene.RegionInfo.RegionSettings.FixedSun)
1121 flags |= RegionFlags.SunFixed; 1121 flags |= RegionFlags.SunFixed;
1122 if (m_scene.RegionInfo.RegionSettings.Sandbox) 1122 if (m_scene.RegionInfo.RegionSettings.Sandbox)
1123 flags |= RegionFlags.Sandbox; 1123 flags |= RegionFlags.Sandbox;
1124 if (m_scene.RegionInfo.EstateSettings.AllowVoice)
1125 flags |= RegionFlags.AllowVoice;
1124 1126
1125 // Fudge these to always on, so the menu options activate 1127 // Fudge these to always on, so the menu options activate
1126 // 1128 //