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

implement code to deregister users on DeregisterCaps

prebuild-update
Justin Clark-Casey (justincc) 2010-07-14 00:16:37 +01:00
parent ee6cd884c9
commit cf7573c8fd
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
View File

@ -64,15 +64,25 @@ namespace OpenSim.Region.CoreModules.Media.Moap
protected Scene m_scene; protected Scene m_scene;
/// <summary> /// <summary>
/// Track the ObjectMedia capabilities given to users /// Track the ObjectMedia capabilities given to users keyed by path
/// </summary> /// </summary>
protected Dictionary<string, UUID> m_omCapUsers = new Dictionary<string, UUID>(); protected Dictionary<string, UUID> m_omCapUsers = new Dictionary<string, UUID>();
/// <summary> /// <summary>
/// Track the ObjectMediaUpdate capabilities given to users /// Track the ObjectMedia capabilities given to users keyed by agent. Lock m_omCapUsers to manipulate.
/// </summary>
protected Dictionary<UUID, string> m_omCapUrls = new Dictionary<UUID, string>();
/// <summary>
/// Track the ObjectMediaUpdate capabilities given to users keyed by path
/// </summary> /// </summary>
protected Dictionary<string, UUID> m_omuCapUsers = new Dictionary<string, UUID>(); protected Dictionary<string, UUID> m_omuCapUsers = new Dictionary<string, UUID>();
/// <summary>
/// Track the ObjectMediaUpdate capabilities given to users keyed by agent. Lock m_omuCapUsers to manipulate
/// </summary>
protected Dictionary<UUID, string> m_omuCapUrls = new Dictionary<UUID, string>();
public void Initialise(IConfigSource config) public void Initialise(IConfigSource config)
{ {
// TODO: Add config switches to enable/disable this module // TODO: Add config switches to enable/disable this module
@ -88,11 +98,13 @@ namespace OpenSim.Region.CoreModules.Media.Moap
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
m_scene.EventManager.OnRegisterCaps += RegisterCaps; m_scene.EventManager.OnRegisterCaps += RegisterCaps;
m_scene.EventManager.OnDeregisterCaps += DeregisterCaps;
} }
public void Close() public void Close()
{ {
m_scene.EventManager.OnRegisterCaps -= RegisterCaps; m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps;
} }
public void RegisterCaps(UUID agentID, Caps caps) public void RegisterCaps(UUID agentID, Caps caps)
@ -105,6 +117,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
lock (m_omCapUsers) lock (m_omCapUsers)
{ {
m_omCapUsers[omCapUrl] = agentID; m_omCapUsers[omCapUrl] = agentID;
m_omCapUrls[agentID] = omCapUrl;
// Even though we're registering for POST we're going to get GETS and UPDATES too // Even though we're registering for POST we're going to get GETS and UPDATES too
caps.RegisterHandler( caps.RegisterHandler(
@ -116,6 +129,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
lock (m_omuCapUsers) lock (m_omuCapUsers)
{ {
m_omuCapUsers[omuCapUrl] = agentID; m_omuCapUsers[omuCapUrl] = agentID;
m_omuCapUrls[agentID] = omuCapUrl;
// Even though we're registering for POST we're going to get GETS and UPDATES too // Even though we're registering for POST we're going to get GETS and UPDATES too
caps.RegisterHandler( caps.RegisterHandler(
@ -123,6 +137,23 @@ namespace OpenSim.Region.CoreModules.Media.Moap
} }
} }
public void DeregisterCaps(UUID agentID, Caps caps)
{
lock (m_omCapUsers)
{
string path = m_omCapUrls[agentID];
m_omCapUrls.Remove(agentID);
m_omCapUsers.Remove(path);
}
lock (m_omuCapUsers)
{
string path = m_omuCapUrls[agentID];
m_omuCapUrls.Remove(agentID);
m_omuCapUsers.Remove(path);
}
}
public MediaEntry GetMediaEntry(SceneObjectPart part, int face) public MediaEntry GetMediaEntry(SceneObjectPart part, int face)
{ {
CheckFaceParam(part, face); CheckFaceParam(part, face);