aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2007-11-12 14:54:13 +0000
committerJeff Ames2007-11-12 14:54:13 +0000
commit008e4a2be850486210c045524ea629de11b0a035 (patch)
tree603aa4c019afd4bc6d2194e1a96d41e32f41e26e
parent* Applied Gerhard's Meshing patch (Thanks! Gerhard) (diff)
downloadopensim-SC_OLD-008e4a2be850486210c045524ea629de11b0a035.zip
opensim-SC_OLD-008e4a2be850486210c045524ea629de11b0a035.tar.gz
opensim-SC_OLD-008e4a2be850486210c045524ea629de11b0a035.tar.bz2
opensim-SC_OLD-008e4a2be850486210c045524ea629de11b0a035.tar.xz
set svn:eol-style, reset default config
-rw-r--r--OpenSim/Region/Physics/Manager/ZeroMesher.cs148
-rw-r--r--bin/mysql_connection.ini6
2 files changed, 77 insertions, 77 deletions
diff --git a/OpenSim/Region/Physics/Manager/ZeroMesher.cs b/OpenSim/Region/Physics/Manager/ZeroMesher.cs
index dafc1c8..a88656e 100644
--- a/OpenSim/Region/Physics/Manager/ZeroMesher.cs
+++ b/OpenSim/Region/Physics/Manager/ZeroMesher.cs
@@ -1,74 +1,74 @@
1/* 1/*
2* Copyright (c) Contributors, http://opensimulator.org/ 2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders. 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4* 4*
5* Redistribution and use in source and binary forms, with or without 5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met: 6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright 7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer. 8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright 9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the 10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution. 11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the 12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 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 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 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 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. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28 28
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using OpenSim.Framework; 32using OpenSim.Framework;
33 33
34 34
35/* 35/*
36 * This is the zero mesher. 36 * This is the zero mesher.
37 * Whatever you want him to mesh, he can't, telling you that by responding with a null pointer. 37 * Whatever you want him to mesh, he can't, telling you that by responding with a null pointer.
38 * Effectivly this is for switching off meshing and for testing as each physics machine should deal 38 * Effectivly this is for switching off meshing and for testing as each physics machine should deal
39 * with the null pointer situation. 39 * with the null pointer situation.
40 * But it's also a convenience thing, as physics machines can rely on having a mesher in any situation, even 40 * But it's also a convenience thing, as physics machines can rely on having a mesher in any situation, even
41 * if it's a dump one like this. 41 * if it's a dump one like this.
42 * Note, that this mesher is *not* living in a module but in the manager itself, so 42 * Note, that this mesher is *not* living in a module but in the manager itself, so
43 * it's always availabe and thus the default in case of configuration errors 43 * it's always availabe and thus the default in case of configuration errors
44*/ 44*/
45 45
46namespace OpenSim.Region.Physics.Manager 46namespace OpenSim.Region.Physics.Manager
47{ 47{
48 public class ZeroMesherPlugin : IMeshingPlugin 48 public class ZeroMesherPlugin : IMeshingPlugin
49 { 49 {
50 public ZeroMesherPlugin() 50 public ZeroMesherPlugin()
51 { 51 {
52 } 52 }
53 53
54 public string GetName() 54 public string GetName()
55 { 55 {
56 return "ZeroMesher"; 56 return "ZeroMesher";
57 } 57 }
58 58
59 public IMesher GetMesher() 59 public IMesher GetMesher()
60 { 60 {
61 return new ZeroMesher(); 61 return new ZeroMesher();
62 } 62 }
63 } 63 }
64 64
65 public class ZeroMesher: IMesher 65 public class ZeroMesher: IMesher
66 { 66 {
67 67
68 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size) 68 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size)
69 { 69 {
70 return null; 70 return null;
71 } 71 }
72 } 72 }
73 73
74} 74}
diff --git a/bin/mysql_connection.ini b/bin/mysql_connection.ini
index 593727d..c8c6c8c 100644
--- a/bin/mysql_connection.ini
+++ b/bin/mysql_connection.ini
@@ -1,7 +1,7 @@
1[mysqlconnection] 1[mysqlconnection]
2hostname=localhost 2hostname=localhost
3database=opensim 3database=database
4username=openSim 4username=username
5password=f1r3st0rm 5password=password
6pooling=false 6pooling=false
7port=3306 \ No newline at end of file 7port=3306 \ No newline at end of file