From 846198bb9ef6aec8a3f351de8ef4393d6b7f35bd Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 9 Nov 2010 23:54:08 +0000
Subject: 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.
---
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
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
if (m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide)
flags |= RegionFlags.AllowParcelChanges;
if (m_scene.RegionInfo.RegionSettings.BlockShowInSearch)
- flags |= (RegionFlags)(1 << 29);
+ flags |= RegionFlags.BlockParcelSearch;
if (m_scene.RegionInfo.RegionSettings.FixedSun)
flags |= RegionFlags.SunFixed;
if (m_scene.RegionInfo.RegionSettings.Sandbox)
flags |= RegionFlags.Sandbox;
+ if (m_scene.RegionInfo.EstateSettings.AllowVoice)
+ flags |= RegionFlags.AllowVoice;
// Fudge these to always on, so the menu options activate
//
--
cgit v1.1