* KeepAlive set to false in expect_user and log_off.
* Check for null SP in PermissionsModule.prioritization
parent
08d3650138
commit
362e94a022
|
@ -148,8 +148,8 @@ namespace OpenSim.Client.Linden
|
|||
protected void AddHttpHandlers()
|
||||
{
|
||||
//we will add our handlers to the first scene we received, as all scenes share a http server. But will this ever change?
|
||||
MainServer.Instance.AddXmlRPCHandler("expect_user", ExpectUser);
|
||||
MainServer.Instance.AddXmlRPCHandler("logoff_user", LogOffUser);
|
||||
MainServer.Instance.AddXmlRPCHandler("expect_user", ExpectUser, false);
|
||||
MainServer.Instance.AddXmlRPCHandler("logoff_user", LogOffUser, false);
|
||||
}
|
||||
|
||||
protected void AddScene(Scene scene)
|
||||
|
|
|
@ -397,10 +397,15 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
|||
// with the powers requested (powers = 0 for no powers check)
|
||||
protected bool IsGroupMember(UUID groupID, UUID userID, ulong powers)
|
||||
{
|
||||
IClientAPI client = m_scene.GetScenePresence(userID).ControllingClient;
|
||||
ScenePresence sp = m_scene.GetScenePresence(userID);
|
||||
if (sp != null)
|
||||
{
|
||||
IClientAPI client = sp.ControllingClient;
|
||||
|
||||
return ((groupID == client.ActiveGroupId) && (client.ActiveGroupPowers != 0) &&
|
||||
((powers == 0) || ((client.ActiveGroupPowers & powers) == powers)));
|
||||
return ((groupID == client.ActiveGroupId) && (client.ActiveGroupPowers != 0) &&
|
||||
((powers == 0) || ((client.ActiveGroupPowers & powers) == powers)));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
Loading…
Reference in New Issue