From e9ea911563362c4766d34cd948a2915beac06124 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Fri, 17 Aug 2012 16:53:36 +0100
Subject: adding a clip method to handle Vector3 objects to enable a minor
amount of refactoring
---
OpenSim/Framework/Util.cs | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'OpenSim/Framework/Util.cs')
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
return Math.Min(Math.Max(x, min), max);
}
+ public static Vector3 Clip(Vector3 vec, float min, float max)
+ {
+ return new Vector3(Clip(vec.X, min, max), Clip(vec.Y, min, max),
+ Clip(vec.Z, min, max));
+ }
+
///
/// Convert an UUID to a raw uuid string. Right now this is a string without hyphens.
///
--
cgit v1.1
From 25111e703f54d84c7c51e32db1f94332ea3ffd00 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 11 Sep 2012 21:48:02 +0100
Subject: Add levels 4 and 5 to "debug http" console command that will log a
sample of incoming request data and the entire incoming data respectively.
See "help debug http" for more details.
---
OpenSim/Framework/Util.cs | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
(limited to 'OpenSim/Framework/Util.cs')
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 38cb3a6..1b9777f 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1007,6 +1007,38 @@ namespace OpenSim.Framework
}
}
+ ///
+ /// Copy data from one stream to another, leaving the read position of both streams at the beginning.
+ ///
+ ///
+ /// Input stream. Must be seekable.
+ ///
+ ///
+ /// Thrown if the input stream is not seekable.
+ ///
+ public static Stream Copy(Stream inputStream)
+ {
+ if (!inputStream.CanSeek)
+ throw new ArgumentException("Util.Copy(Stream inputStream) must receive an inputStream that can seek");
+
+ const int readSize = 256;
+ byte[] buffer = new byte[readSize];
+ MemoryStream ms = new MemoryStream();
+
+ int count = inputStream.Read(buffer, 0, readSize);
+
+ while (count > 0)
+ {
+ ms.Write(buffer, 0, count);
+ count = inputStream.Read(buffer, 0, readSize);
+ }
+
+ ms.Position = 0;
+ inputStream.Position = 0;
+
+ return ms;
+ }
+
public static XmlRpcResponse XmlRpcCommand(string url, string methodName, params object[] args)
{
return SendXmlRpcCommand(url, methodName, args);
--
cgit v1.1
From 130768b16a35e307389e88d902f6e3a785dfb8ee Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 5 Oct 2012 03:52:42 +0100
Subject: Add "show object pos to " command to
simulator console.
This allows you to display details of all objects in a given bounding box.
Values parts of the co-ord can be left out as appropriate (e.g. to get all objects between the ground and z=30.
See "help show object pos" for more details.
---
OpenSim/Framework/Util.cs | 13 +++++++++++++
1 file changed, 13 insertions(+)
(limited to 'OpenSim/Framework/Util.cs')
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 1b9777f..5c7797a 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -534,6 +534,19 @@ namespace OpenSim.Framework
}
///
+ /// Determines whether a point is inside a bounding box.
+ ///
+ /// /param>
+ ///
+ ///
+ ///
+ public static bool IsInsideBox(Vector3 v, Vector3 min, Vector3 max)
+ {
+ return v.X >= min.X & v.Y >= min.Y && v.Z >= min.Z
+ && v.X <= max.X && v.Y <= max.Y && v.Z <= max.Z;
+ }
+
+ ///
/// Are the co-ordinates of the new region visible from the old region?
///
/// Old region x-coord
--
cgit v1.1
From 56965dd9599597bf5c51ab795f278db8291514c2 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Tue, 16 Oct 2012 13:00:16 +0100
Subject: fixing poorly-formatted xml doc string for Util.IsInsideBox
---
OpenSim/Framework/Util.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework/Util.cs')
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 5c7797a..c369dbc 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -536,7 +536,7 @@ namespace OpenSim.Framework
///
/// Determines whether a point is inside a bounding box.
///
- /// /param>
+ ///
///
///
///
--
cgit v1.1