OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

revert group membership checking to older code pending resolution of reported performance problems

0.6.9-post-fixes
Justin Clark-Casey (justincc) 2010-06-11 19:40:09 +01:00
parent 821b8a5517
commit 85c20e1493
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@ -414,6 +414,16 @@ namespace OpenSim.Region.CoreModules.World.Permissions
//DateTime t1 = DateTime.Now; //DateTime t1 = DateTime.Now;
bool result = false; bool result = false;
ScenePresence sp = m_scene.GetScenePresence(userID);
if (sp != null)
{
IClientAPI client = sp.ControllingClient;
result = ((groupID == client.ActiveGroupId) && (client.ActiveGroupPowers != 0) &&
((powers == 0) || ((client.ActiveGroupPowers & powers) == powers)));
}
/*
if (null != m_groupsModule) if (null != m_groupsModule)
{ {
GroupMembershipData gmd = m_groupsModule.GetMembershipData(groupID, userID); GroupMembershipData gmd = m_groupsModule.GetMembershipData(groupID, userID);
@ -424,6 +434,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
result = true; result = true;
} }
} }
*/
//m_log.DebugFormat("[PERMISSIONS]: Group member check took {0}", (DateTime.Now - t1).TotalMilliseconds); //m_log.DebugFormat("[PERMISSIONS]: Group member check took {0}", (DateTime.Now - t1).TotalMilliseconds);