diff options
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index e20b322..13a4b3f 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -1441,4 +1441,4 @@ namespace OpenSim.Framework | |||
| 1441 | return (diff >= 0) ? diff : (diff + EnvironmentTickCountMask + 1); | 1441 | return (diff >= 0) ? diff : (diff + EnvironmentTickCountMask + 1); |
| 1442 | } | 1442 | } |
| 1443 | } | 1443 | } |
| 1444 | } | 1444 | } \ No newline at end of file |