remove ban check from create caps. That needs to be done on caller
(scene.NewUserConnection()) acording to cases, and with minimal calls to external grid services.avinationmerge
parent
b4a7126167
commit
117d563fd4
|
@ -120,10 +120,16 @@ namespace OpenSim.Region.CoreModules.Framework
|
||||||
|
|
||||||
public void CreateCaps(UUID agentId, uint circuitCode)
|
public void CreateCaps(UUID agentId, uint circuitCode)
|
||||||
{
|
{
|
||||||
|
// int ts = Util.EnvironmentTickCount();
|
||||||
|
/* this as no business here...
|
||||||
|
* must be done elsewhere ( and is )
|
||||||
int flags = m_scene.GetUserFlags(agentId);
|
int flags = m_scene.GetUserFlags(agentId);
|
||||||
|
|
||||||
|
m_log.ErrorFormat("[CreateCaps]: banCheck {0} ", Util.EnvironmentTickCountSubtract(ts));
|
||||||
|
|
||||||
if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
|
if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
|
||||||
return;
|
return;
|
||||||
|
*/
|
||||||
Caps caps;
|
Caps caps;
|
||||||
String capsObjectPath = GetCapsPath(agentId);
|
String capsObjectPath = GetCapsPath(agentId);
|
||||||
|
|
||||||
|
@ -132,19 +138,27 @@ namespace OpenSim.Region.CoreModules.Framework
|
||||||
if (m_capsObjects.ContainsKey(circuitCode))
|
if (m_capsObjects.ContainsKey(circuitCode))
|
||||||
{
|
{
|
||||||
Caps oldCaps = m_capsObjects[circuitCode];
|
Caps oldCaps = m_capsObjects[circuitCode];
|
||||||
|
|
||||||
//m_log.WarnFormat(
|
// if (capsObjectPath == oldCaps.CapsObjectPath)
|
||||||
// "[CAPS]: Recreating caps for agent {0} in region {1}. Old caps path {2}, new caps path {3}. ",
|
// {
|
||||||
// agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath);
|
// m_log.WarnFormat(
|
||||||
|
// "[CAPS]: Reusing caps for agent {0} in region {1}. Old caps path {2}, new caps path {3}. ",
|
||||||
|
// agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath);
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
|
caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
|
||||||
(MainServer.Instance == null) ? 0: MainServer.Instance.Port,
|
(MainServer.Instance == null) ? 0: MainServer.Instance.Port,
|
||||||
capsObjectPath, agentId, m_scene.RegionInfo.RegionName);
|
capsObjectPath, agentId, m_scene.RegionInfo.RegionName);
|
||||||
|
|
||||||
|
// m_log.ErrorFormat("[CreateCaps]: new caps {0} ", Util.EnvironmentTickCountSubtract(ts));
|
||||||
|
|
||||||
m_capsObjects[circuitCode] = caps;
|
m_capsObjects[circuitCode] = caps;
|
||||||
}
|
}
|
||||||
m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps);
|
m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps);
|
||||||
|
// m_log.ErrorFormat("[CreateCaps]: end {0} ", Util.EnvironmentTickCountSubtract(ts));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RemoveCaps(UUID agentId, uint circuitCode)
|
public void RemoveCaps(UUID agentId, uint circuitCode)
|
||||||
|
|
Loading…
Reference in New Issue