ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

change usermanagement user homeurl verification and local grid detection, using new GridInfo and OSHHTPHost

Browse Source
This commit is contained in:
UbitUmarov
2020-11-21 00:36:47 +00:00
parent 2f66a82cbe
commit 2fbd14722d
4 changed files with 146 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Framework/ExpiringKey.cs
View File

@@ -120,7 +120,8 @@ namespace OpenSim.Framework
List<Tkey1> expired = new List<Tkey1>(m_dictionary.Count);
foreach(KeyValuePair<Tkey1,int> kvp in m_dictionary)
{
if(kvp.Value < now)
int expire = kvp.Value;
if (expire > 0 && expire < now)
expired.Add(kvp.Key);
}
@@ -186,8 +187,14 @@ namespace OpenSim.Framework
public void Add(Tkey1 key, int expireMS)
{
bool gotLock = false;
expireMS = (expireMS > m_expire) ? expireMS : m_expire;
int now = (int)(Util.GetTimeStampMS() - m_startTS) + expireMS;
int now;
if (expireMS > 0)
{
expireMS = (expireMS > m_expire) ? expireMS : m_expire;
now = (int)(Util.GetTimeStampMS() - m_startTS) + expireMS;
}
else
now = int.MinValue;
try
{
@@ -303,8 +310,14 @@ namespace OpenSim.Framework
m_rwLock.EnterWriteLock();
gotWriteLock = true;
}
expireMS = (expireMS > m_expire) ? expireMS : m_expire;
int now = (int)(Util.GetTimeStampMS() - m_startTS) + expireMS;
int now;
if (expireMS > 0)
{
expireMS = (expireMS > m_expire) ? expireMS : m_expire;
now = (int)(Util.GetTimeStampMS() - m_startTS) + expireMS;
}
else
now = int.MinValue;
m_dictionary[key] = now;
return true;