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

* KeepAlive set to false in expect_user and log_off. 

* Check for null SP in PermissionsModule.
prioritization
Diva Canto 2009-10-04 16:30:12 -07:00
parent 08d3650138
commit 362e94a022
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Client/Linden/LLProxyLoginModule.cs
View File

@ -148,8 +148,8 @@ namespace OpenSim.Client.Linden
protected void AddHttpHandlers() 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? //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("expect_user", ExpectUser, false);
MainServer.Instance.AddXmlRPCHandler("logoff_user", LogOffUser); MainServer.Instance.AddXmlRPCHandler("logoff_user", LogOffUser, false);
} }
protected void AddScene(Scene scene) protected void AddScene(Scene scene)

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

@ -397,10 +397,15 @@ namespace OpenSim.Region.CoreModules.World.Permissions
// with the powers requested (powers = 0 for no powers check) // with the powers requested (powers = 0 for no powers check)
protected bool IsGroupMember(UUID groupID, UUID userID, ulong powers) 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)
return ((groupID == client.ActiveGroupId) && (client.ActiveGroupPowers != 0) && {
((powers == 0) || ((client.ActiveGroupPowers & powers) == powers))); IClientAPI client = sp.ControllingClient;
return ((groupID == client.ActiveGroupId) && (client.ActiveGroupPowers != 0) &&
((powers == 0) || ((client.ActiveGroupPowers & powers) == powers)));
}
return false;
} }
/// <summary> /// <summary>