diff options
author | Teravus Ovares | 2008-03-30 19:58:14 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-03-30 19:58:14 +0000 |
commit | 8aa4308097ebcc8d51e4d470fe6b0f3582990c3b (patch) | |
tree | cd0b12fb244182b8342dce86635b841d1f0b76b5 /OpenSim | |
parent | * Quick fix. Re-enabled some code which registers the Terrain Module's Comman... (diff) | |
download | opensim-SC-8aa4308097ebcc8d51e4d470fe6b0f3582990c3b.zip opensim-SC-8aa4308097ebcc8d51e4d470fe6b0f3582990c3b.tar.gz opensim-SC-8aa4308097ebcc8d51e4d470fe6b0f3582990c3b.tar.bz2 opensim-SC-8aa4308097ebcc8d51e4d470fe6b0f3582990c3b.tar.xz |
* Minor cleanup
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 2 | ||||
-rw-r--r-- | 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 095740d..7f284d3 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -285,10 +285,7 @@ namespace OpenSim.Framework | |||
285 | RegionID = LLUUID.Zero; | 285 | RegionID = LLUUID.Zero; |
286 | ServerURI = ConvertFrom.ServerURI; | 286 | ServerURI = ConvertFrom.ServerURI; |
287 | } | 287 | } |
288 | public int getInternalEndPointPort() | 288 | |
289 | { | ||
290 | return m_internalEndPoint.Port; | ||
291 | } | ||
292 | public void SetEndPoint(string ipaddr, int port) | 289 | public void SetEndPoint(string ipaddr, int port) |
293 | { | 290 | { |
294 | IPAddress tmpIP = IPAddress.Parse(ipaddr); | 291 | IPAddress tmpIP = IPAddress.Parse(ipaddr); |
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 10d052e..6562768 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -3611,7 +3611,6 @@ namespace OpenSim.Region.ClientStack | |||
3611 | } | 3611 | } |
3612 | 3612 | ||
3613 | break; | 3613 | break; |
3614 | break; | ||
3615 | case PacketType.RequestObjectPropertiesFamily: | 3614 | case PacketType.RequestObjectPropertiesFamily: |
3616 | //This powers the little tooltip that appears when you move your mouse over an object | 3615 | //This powers the little tooltip that appears when you move your mouse over an object |
3617 | RequestObjectPropertiesFamilyPacket packToolTip = (RequestObjectPropertiesFamilyPacket)Pack; | 3616 | RequestObjectPropertiesFamilyPacket packToolTip = (RequestObjectPropertiesFamilyPacket)Pack; |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 62978fd..e9492a9 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
71 | private bool m_pidControllerActive = true; | 71 | private bool m_pidControllerActive = true; |
72 | private float PID_D = 800.0f; | 72 | private float PID_D = 800.0f; |
73 | private float PID_P = 900.0f; | 73 | private float PID_P = 900.0f; |
74 | private static float POSTURE_SERVO = 10000.0f; | 74 | //private static float POSTURE_SERVO = 10000.0f; |
75 | public static float CAPSULE_RADIUS = 0.37f; | 75 | public static float CAPSULE_RADIUS = 0.37f; |
76 | public float CAPSULE_LENGTH = 2.140599f; | 76 | public float CAPSULE_LENGTH = 2.140599f; |
77 | private float m_tensor = 3800000f; | 77 | private float m_tensor = 3800000f; |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 43a7272..309a767 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -1092,7 +1092,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1092 | if (IsPhysical && Body != (IntPtr)0 && !m_isSelected) | 1092 | if (IsPhysical && Body != (IntPtr)0 && !m_isSelected) |
1093 | { | 1093 | { |
1094 | float PID_D = 2200.0f; | 1094 | float PID_D = 2200.0f; |
1095 | float PID_P = 900.0f; | 1095 | //float PID_P = 900.0f; |
1096 | 1096 | ||
1097 | 1097 | ||
1098 | float m_mass = CalculateMass(); | 1098 | float m_mass = CalculateMass(); |
@@ -1134,15 +1134,15 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1134 | if (System.Environment.OSVersion.Platform == PlatformID.Unix) | 1134 | if (System.Environment.OSVersion.Platform == PlatformID.Unix) |
1135 | { | 1135 | { |
1136 | PID_D = 3200.0f; | 1136 | PID_D = 3200.0f; |
1137 | PID_P = 1400.0f; | 1137 | //PID_P = 1400.0f; |
1138 | } | 1138 | } |
1139 | else | 1139 | else |
1140 | { | 1140 | { |
1141 | PID_D = 2200.0f; | 1141 | PID_D = 2200.0f; |
1142 | PID_P = 900.0f; | 1142 | //PID_P = 900.0f; |
1143 | } | 1143 | } |
1144 | PID_D = 1.0f; | 1144 | PID_D = 1.0f; |
1145 | PID_P = 1.0f; | 1145 | //PID_P = 1.0f; |
1146 | 1146 | ||
1147 | 1147 | ||
1148 | //PidStatus = true; | 1148 | //PidStatus = true; |