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

revert EnvironmentTick back to orignal clock, since change may cause issues on some code paths. Clean a bit get mesh and get texture throttle

Browse Source
This commit is contained in:
UbitUmarov
2017-06-19 05:22:38 +01:00
parent fe0fce424c
commit 79e166e9aa
3 changed files with 49 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/Util.cs
View File

@@ -2967,9 +2967,9 @@ namespace OpenSim.Framework
/// <returns></returns>
public static Int32 EnvironmentTickCount()
{
double now = GetTimeStampMS();
return (int)now;
return Environment.TickCount & EnvironmentTickCountMask;
}
const Int32 EnvironmentTickCountMask = 0x3fffffff;
/// <summary>
@@ -2994,8 +2994,7 @@ namespace OpenSim.Framework
/// <returns>subtraction of passed prevValue from current Environment.TickCount</returns>
public static Int32 EnvironmentTickCountSubtract(Int32 prevValue)
{
double now = GetTimeStampMS();
return EnvironmentTickCountSubtract((int)now, prevValue);
return EnvironmentTickCountSubtract(EnvironmentTickCount(), prevValue);
}
// Returns value of Tick Count A - TickCount B accounting for wrapping of TickCount