diff options
author | Melanie | 2012-12-23 18:05:17 +0000 |
---|---|---|
committer | Melanie | 2012-12-23 18:05:17 +0000 |
commit | a126097d6be209ba4e30b5573195c04bcf2d8c1e (patch) | |
tree | bce8220f560827a332155ca84e16de94677ca235 /OpenSim/Framework | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | BulletSim: modify avatar motor code to make falling movement better. Clean up... (diff) | |
download | opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.zip opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.gz opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.bz2 opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Util.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index d206fc1..4d132bb 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -299,6 +299,13 @@ namespace OpenSim.Framework | |||
299 | x; | 299 | x; |
300 | } | 300 | } |
301 | 301 | ||
302 | // Inclusive, within range test (true if equal to the endpoints) | ||
303 | public static bool InRange<T>(T x, T min, T max) | ||
304 | where T : IComparable<T> | ||
305 | { | ||
306 | return x.CompareTo(max) <= 0 && x.CompareTo(min) >= 0; | ||
307 | } | ||
308 | |||
302 | public static uint GetNextXferID() | 309 | public static uint GetNextXferID() |
303 | { | 310 | { |
304 | uint id = 0; | 311 | uint id = 0; |