aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs
diff options
context:
space:
mode:
authorMelanie2012-08-18 12:57:49 +0100
committerMelanie2012-08-18 12:57:49 +0100
commit9d6fe1224aa90896edb624d34f77d7c36b368258 (patch)
treee88deb1ab440dce0db50e8745e4171e56413959c /OpenSim/Framework/Util.cs
parentDo a proper null check to avoid the overloaded operator == trap (diff)
parentWhen reporting a thread timeout, create a copy of the info rather than passin... (diff)
downloadopensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.zip
opensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.tar.gz
opensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.tar.bz2
opensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Util.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 8cc29ee..38cb3a6 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -850,6 +850,12 @@ namespace OpenSim.Framework
850 return Math.Min(Math.Max(x, min), max); 850 return Math.Min(Math.Max(x, min), max);
851 } 851 }
852 852
853 public static Vector3 Clip(Vector3 vec, float min, float max)
854 {
855 return new Vector3(Clip(vec.X, min, max), Clip(vec.Y, min, max),
856 Clip(vec.Z, min, max));
857 }
858
853 /// <summary> 859 /// <summary>
854 /// Convert an UUID to a raw uuid string. Right now this is a string without hyphens. 860 /// Convert an UUID to a raw uuid string. Right now this is a string without hyphens.
855 /// </summary> 861 /// </summary>