aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs
diff options
context:
space:
mode:
authorteravus2013-03-14 00:58:00 -0400
committerteravus2013-03-14 00:58:00 -0400
commit9fad90a914eca234ec35fcfe115a212b603bfb52 (patch)
tree83580aba3ad8c7424be79956603cbccd2380d651 /OpenSim/Framework/Util.cs
parent* Updates HttpServer again to re-add the code that closes the stream and conn... (diff)
parentImprove DAExampleModule to show current necessary locking to avoid race condi... (diff)
downloadopensim-SC_OLD-9fad90a914eca234ec35fcfe115a212b603bfb52.zip
opensim-SC_OLD-9fad90a914eca234ec35fcfe115a212b603bfb52.tar.gz
opensim-SC_OLD-9fad90a914eca234ec35fcfe115a212b603bfb52.tar.bz2
opensim-SC_OLD-9fad90a914eca234ec35fcfe115a212b603bfb52.tar.xz
Merge branch 'master' of ssh://opensim/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Util.cs')
-rw-r--r--OpenSim/Framework/Util.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 0fa54b2..94a172c 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -303,12 +303,12 @@ namespace OpenSim.Framework
303 // Clamp the maximum magnitude of a vector 303 // Clamp the maximum magnitude of a vector
304 public static Vector3 ClampV(Vector3 x, float max) 304 public static Vector3 ClampV(Vector3 x, float max)
305 { 305 {
306 Vector3 ret = x;
307 float lenSq = x.LengthSquared(); 306 float lenSq = x.LengthSquared();
308 if (lenSq > (max * max)) 307 if (lenSq > (max * max))
309 { 308 {
310 x = x / x.Length() * max; 309 x = x / x.Length() * max;
311 } 310 }
311
312 return x; 312 return x;
313 } 313 }
314 314