Fixing SVN: Added some things I forgot to include (1/3)

author: mingchen 2007-06-07 14:32:48 +0000
committer: mingchen 2007-06-07 14:32:48 +0000
commit: 6f7a053d318d7db5352f2967d4c179f42d00bd8b (patch)
tree: 75afdae942b99d5251c5c06a42383f6748242688 /OpenSim
parent: Updated SimAddress in sandbox mode. (diff)
download: opensim-SC_OLD-6f7a053d318d7db5352f2967d4c179f42d00bd8b.zip
opensim-SC_OLD-6f7a053d318d7db5352f2967d4c179f42d00bd8b.tar.gz
opensim-SC_OLD-6f7a053d318d7db5352f2967d4c179f42d00bd8b.tar.bz2
opensim-SC_OLD-6f7a053d318d7db5352f2967d4c179f42d00bd8b.tar.xz
2 files changed, 0 insertions, 110 deletions
diff --git a/OpenSim/OpenSim.RegionServer/types/Mesh.cs b/OpenSim/OpenSim.RegionServer/types/Mesh.cs
deleted file mode 100644
index 4c8acab..0000000
--- a/OpenSim/OpenSim.RegionServer/types/Mesh.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.RegionServer.Types
-{
-    // TODO: This will need some performance tuning no doubt.
-    public class Mesh
-    {
-        public List<Triangle> mesh;
-        public Mesh()
-        {
-            mesh = new List<Triangle>();
-        }
-        public void AddTri(Triangle tri)
-        {
-            mesh.Add(tri);
-        }
-        public static Mesh operator +(Mesh a, Mesh b)
-        {
-            a.mesh.AddRange(b.mesh);
-            return a;
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.RegionServer/types/Triangle.cs b/OpenSim/OpenSim.RegionServer/types/Triangle.cs
deleted file mode 100644
index ffb62e5..0000000
--- a/OpenSim/OpenSim.RegionServer/types/Triangle.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Axiom.MathLib;
-namespace OpenSim.RegionServer.Types
-{
-    public class Triangle
-    {
-        Vector3 a;
-        Vector3 b;
-        Vector3 c;
-        public Triangle()
-        {
-            a = new Vector3();
-            b = new Vector3();
-            c = new Vector3();
-        }
-        public Triangle(Vector3 A, Vector3 B, Vector3 C)
-        {
-            a = A;
-            b = B;
-            c = C;
-        }
-    }
-}
author	mingchen	2007-06-07 14:32:48 +0000
committer	mingchen	2007-06-07 14:32:48 +0000
commit	6f7a053d318d7db5352f2967d4c179f42d00bd8b (patch)
tree	75afdae942b99d5251c5c06a42383f6748242688 /OpenSim
parent	Updated SimAddress in sandbox mode. (diff)
download	opensim-SC_OLD-6f7a053d318d7db5352f2967d4c179f42d00bd8b.zip opensim-SC_OLD-6f7a053d318d7db5352f2967d4c179f42d00bd8b.tar.gz opensim-SC_OLD-6f7a053d318d7db5352f2967d4c179f42d00bd8b.tar.bz2 opensim-SC_OLD-6f7a053d318d7db5352f2967d4c179f42d00bd8b.tar.xz

diff --git a/OpenSim/OpenSim.RegionServer/types/Mesh.cs b/OpenSim/OpenSim.RegionServer/types/Mesh.cs deleted file mode 100644 index 4c8acab..0000000 --- a/OpenSim/OpenSim.RegionServer/types/Mesh.cs +++ /dev/null
@@ -1,55 +0,0 @@
1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*
5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.
15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*
27	*/
28	using System;
29	using System.Collections.Generic;
30	using System.Text;
31
32	namespace OpenSim.RegionServer.Types
33	{
34	// TODO: This will need some performance tuning no doubt.
35	public class Mesh
36	{
37	public List<Triangle> mesh;
38
39	public Mesh()
40	{
41	mesh = new List<Triangle>();
42	}
43
44	public void AddTri(Triangle tri)
45	{
46	mesh.Add(tri);
47	}
48
49	public static Mesh operator +(Mesh a, Mesh b)
50	{
51	a.mesh.AddRange(b.mesh);
52	return a;
53	}
54	}
55	}


diff --git a/OpenSim/OpenSim.RegionServer/types/Triangle.cs b/OpenSim/OpenSim.RegionServer/types/Triangle.cs deleted file mode 100644 index ffb62e5..0000000 --- a/OpenSim/OpenSim.RegionServer/types/Triangle.cs +++ /dev/null
@@ -1,55 +0,0 @@
1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*
5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.
15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*
27	*/
28	using System;
29	using System.Collections.Generic;
30	using System.Text;
31	using Axiom.MathLib;
32
33	namespace OpenSim.RegionServer.Types
34	{
35	public class Triangle
36	{
37	Vector3 a;
38	Vector3 b;
39	Vector3 c;
40
41	public Triangle()
42	{
43	a = new Vector3();
44	b = new Vector3();
45	c = new Vector3();
46	}
47
48	public Triangle(Vector3 A, Vector3 B, Vector3 C)
49	{
50	a = A;
51	b = B;
52	c = C;
53	}
54	}
55	}