diff options
author | Jeff Ames | 2009-02-13 02:06:28 +0000 |
---|---|---|
committer | Jeff Ames | 2009-02-13 02:06:28 +0000 |
commit | 95d53d48d4ce44cebf0f2d5803f58a0f7cfe8346 (patch) | |
tree | 576c3343f7973335e12b3ea05b0a4d1957440194 /OpenSim/Region/Physics | |
parent | Update svn properties. (diff) | |
download | opensim-SC_OLD-95d53d48d4ce44cebf0f2d5803f58a0f7cfe8346.zip opensim-SC_OLD-95d53d48d4ce44cebf0f2d5803f58a0f7cfe8346.tar.gz opensim-SC_OLD-95d53d48d4ce44cebf0f2d5803f58a0f7cfe8346.tar.bz2 opensim-SC_OLD-95d53d48d4ce44cebf0f2d5803f58a0f7cfe8346.tar.xz |
Add copyright headers. Minor formatting cleanup. Fix some compiler warnings. Fix some m_log declarations.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index b2981fe..16e0efe 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -837,7 +837,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
837 | d.Vector3 pos = d.BodyGetPosition(Body); | 837 | d.Vector3 pos = d.BodyGetPosition(Body); |
838 | float ground_height = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y); | 838 | float ground_height = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y); |
839 | float target_altitude = ground_height + 3.0f; // This is the min fly height | 839 | float target_altitude = ground_height + 3.0f; // This is the min fly height |
840 | if(pos.Z < target_altitude) | 840 | if (pos.Z < target_altitude) |
841 | { | 841 | { |
842 | vec.Z += (target_altitude - pos.Z) * PID_P * 5.0f; | 842 | vec.Z += (target_altitude - pos.Z) * PID_P * 5.0f; |
843 | } | 843 | } |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 0f18be4..ae47636 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | /* | 1 | /* |
3 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
4 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
@@ -10,7 +9,7 @@ | |||
10 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
11 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
12 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
13 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
14 | * 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 |
15 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
16 | * | 15 | * |
@@ -25,6 +24,7 @@ | |||
25 | * (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 |
26 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ | 26 | */ |
27 | |||
28 | //#define USE_DRAWSTUFF | 28 | //#define USE_DRAWSTUFF |
29 | 29 | ||
30 | using System; | 30 | using System; |