Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

author: Melanie 2011-01-27 02:29:10 +0100
committer: Melanie 2011-01-27 02:29:10 +0100
commit: 3321f9d745ea782667b664365f23be75a2b047f5 (patch)
tree: ccb46a08ca26868049d269ecd68eac5bd94867da /OpenSim/Region/CoreModules
parent: Make bans work for teleport. Now teleport will complete block if the user (diff)
parent: Mostly revert the last commit with the aim of searching for a better solution (diff)
download: opensim-SC_OLD-3321f9d745ea782667b664365f23be75a2b047f5.zip
opensim-SC_OLD-3321f9d745ea782667b664365f23be75a2b047f5.tar.gz
opensim-SC_OLD-3321f9d745ea782667b664365f23be75a2b047f5.tar.bz2
opensim-SC_OLD-3321f9d745ea782667b664365f23be75a2b047f5.tar.xz
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index c023a6f..5c5cb70 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -88,7 +88,8 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
        public void AddCapsHandler(UUID agentId)
        {
-            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId))
+            int flags = m_scene.GetUserFlags(agentId);
+            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
                return;
            String capsObjectPath = GetCapsPath(agentId);
author	Melanie	2011-01-27 02:29:10 +0100
committer	Melanie	2011-01-27 02:29:10 +0100
commit	3321f9d745ea782667b664365f23be75a2b047f5 (patch)
tree	ccb46a08ca26868049d269ecd68eac5bd94867da /OpenSim/Region/CoreModules
parent	Make bans work for teleport. Now teleport will complete block if the user (diff)
parent	Mostly revert the last commit with the aim of searching for a better solution (diff)
download	opensim-SC_OLD-3321f9d745ea782667b664365f23be75a2b047f5.zip opensim-SC_OLD-3321f9d745ea782667b664365f23be75a2b047f5.tar.gz opensim-SC_OLD-3321f9d745ea782667b664365f23be75a2b047f5.tar.bz2 opensim-SC_OLD-3321f9d745ea782667b664365f23be75a2b047f5.tar.xz

diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index c023a6f..5c5cb70 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -88,7 +88,8 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
88		88
89	public void AddCapsHandler(UUID agentId)	89	public void AddCapsHandler(UUID agentId)
90	{	90	{
91	if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId))	91	int flags = m_scene.GetUserFlags(agentId);
		92	if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
92	return;	93	return;
93		94
94	String capsObjectPath = GetCapsPath(agentId);	95	String capsObjectPath = GetCapsPath(agentId);