diff options
author | UbitUmarov | 2017-06-19 05:22:38 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-19 05:22:38 +0100 |
commit | 79e166e9aaf56b6798e27201962f6e109925c697 (patch) | |
tree | 4b2dfcc5f59b3def086e7eeafec85ff1fae7a721 /OpenSim/Framework | |
parent | a defual can me comented out (diff) | |
download | opensim-SC_OLD-79e166e9aaf56b6798e27201962f6e109925c697.zip opensim-SC_OLD-79e166e9aaf56b6798e27201962f6e109925c697.tar.gz opensim-SC_OLD-79e166e9aaf56b6798e27201962f6e109925c697.tar.bz2 opensim-SC_OLD-79e166e9aaf56b6798e27201962f6e109925c697.tar.xz |
revert EnvironmentTick back to orignal clock, since change may cause issues on some code paths. Clean a bit get mesh and get texture throttle
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Util.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index a855767..af14939 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -2967,9 +2967,9 @@ namespace OpenSim.Framework | |||
2967 | /// <returns></returns> | 2967 | /// <returns></returns> |
2968 | public static Int32 EnvironmentTickCount() | 2968 | public static Int32 EnvironmentTickCount() |
2969 | { | 2969 | { |
2970 | double now = GetTimeStampMS(); | 2970 | return Environment.TickCount & EnvironmentTickCountMask; |
2971 | return (int)now; | ||
2972 | } | 2971 | } |
2972 | |||
2973 | const Int32 EnvironmentTickCountMask = 0x3fffffff; | 2973 | const Int32 EnvironmentTickCountMask = 0x3fffffff; |
2974 | 2974 | ||
2975 | /// <summary> | 2975 | /// <summary> |
@@ -2994,8 +2994,7 @@ namespace OpenSim.Framework | |||
2994 | /// <returns>subtraction of passed prevValue from current Environment.TickCount</returns> | 2994 | /// <returns>subtraction of passed prevValue from current Environment.TickCount</returns> |
2995 | public static Int32 EnvironmentTickCountSubtract(Int32 prevValue) | 2995 | public static Int32 EnvironmentTickCountSubtract(Int32 prevValue) |
2996 | { | 2996 | { |
2997 | double now = GetTimeStampMS(); | 2997 | return EnvironmentTickCountSubtract(EnvironmentTickCount(), prevValue); |
2998 | return EnvironmentTickCountSubtract((int)now, prevValue); | ||
2999 | } | 2998 | } |
3000 | 2999 | ||
3001 | // Returns value of Tick Count A - TickCount B accounting for wrapping of TickCount | 3000 | // Returns value of Tick Count A - TickCount B accounting for wrapping of TickCount |