From 8aa4308097ebcc8d51e4d470fe6b0f3582990c3b Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sun, 30 Mar 2008 19:58:14 +0000 Subject: [PATCH] * Minor cleanup --- OpenSim/Framework/RegionInfo.cs | 5 +---- OpenSim/Region/ClientStack/ClientView.cs | 1 - OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 2 +- OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 8 ++++---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 095740d1ba..7f284d39aa 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -285,10 +285,7 @@ namespace OpenSim.Framework RegionID = LLUUID.Zero; ServerURI = ConvertFrom.ServerURI; } - public int getInternalEndPointPort() - { - return m_internalEndPoint.Port; - } + public void SetEndPoint(string ipaddr, int port) { IPAddress tmpIP = IPAddress.Parse(ipaddr); diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 10d052e5e8..65627688f0 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs @@ -3611,7 +3611,6 @@ namespace OpenSim.Region.ClientStack } break; - break; case PacketType.RequestObjectPropertiesFamily: //This powers the little tooltip that appears when you move your mouse over an object RequestObjectPropertiesFamilyPacket packToolTip = (RequestObjectPropertiesFamilyPacket)Pack; diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 62978fdc26..e9492a9e2e 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs @@ -71,7 +71,7 @@ namespace OpenSim.Region.Physics.OdePlugin private bool m_pidControllerActive = true; private float PID_D = 800.0f; private float PID_P = 900.0f; - private static float POSTURE_SERVO = 10000.0f; + //private static float POSTURE_SERVO = 10000.0f; public static float CAPSULE_RADIUS = 0.37f; public float CAPSULE_LENGTH = 2.140599f; private float m_tensor = 3800000f; diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 43a727274f..309a7675e1 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs @@ -1092,7 +1092,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (IsPhysical && Body != (IntPtr)0 && !m_isSelected) { float PID_D = 2200.0f; - float PID_P = 900.0f; + //float PID_P = 900.0f; float m_mass = CalculateMass(); @@ -1134,15 +1134,15 @@ namespace OpenSim.Region.Physics.OdePlugin if (System.Environment.OSVersion.Platform == PlatformID.Unix) { PID_D = 3200.0f; - PID_P = 1400.0f; + //PID_P = 1400.0f; } else { PID_D = 2200.0f; - PID_P = 900.0f; + //PID_P = 900.0f; } PID_D = 1.0f; - PID_P = 1.0f; + //PID_P = 1.0f; //PidStatus = true;