OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Minor cleanup

0.6.0-stable
Teravus Ovares 2008-03-30 19:58:14 +00:00
parent c502416548
commit 8aa4308097
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/RegionInfo.cs
View File

@ -285,10 +285,7 @@ namespace OpenSim.Framework
RegionID = LLUUID.Zero; RegionID = LLUUID.Zero;
ServerURI = ConvertFrom.ServerURI; ServerURI = ConvertFrom.ServerURI;
} }
public int getInternalEndPointPort()
{
return m_internalEndPoint.Port;
}
public void SetEndPoint(string ipaddr, int port) public void SetEndPoint(string ipaddr, int port)
{ {
IPAddress tmpIP = IPAddress.Parse(ipaddr); IPAddress tmpIP = IPAddress.Parse(ipaddr);

1
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -3611,7 +3611,6 @@ namespace OpenSim.Region.ClientStack
} }
break; break;
break;
case PacketType.RequestObjectPropertiesFamily: case PacketType.RequestObjectPropertiesFamily:
//This powers the little tooltip that appears when you move your mouse over an object //This powers the little tooltip that appears when you move your mouse over an object
RequestObjectPropertiesFamilyPacket packToolTip = (RequestObjectPropertiesFamilyPacket)Pack; RequestObjectPropertiesFamilyPacket packToolTip = (RequestObjectPropertiesFamilyPacket)Pack;

2
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -71,7 +71,7 @@ namespace OpenSim.Region.Physics.OdePlugin
private bool m_pidControllerActive = true; private bool m_pidControllerActive = true;
private float PID_D = 800.0f; private float PID_D = 800.0f;
private float PID_P = 900.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 static float CAPSULE_RADIUS = 0.37f;
public float CAPSULE_LENGTH = 2.140599f; public float CAPSULE_LENGTH = 2.140599f;
private float m_tensor = 3800000f; private float m_tensor = 3800000f;

8
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -1092,7 +1092,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (IsPhysical && Body != (IntPtr)0 && !m_isSelected) if (IsPhysical && Body != (IntPtr)0 && !m_isSelected)
{ {
float PID_D = 2200.0f; float PID_D = 2200.0f;
float PID_P = 900.0f; //float PID_P = 900.0f;
float m_mass = CalculateMass(); float m_mass = CalculateMass();
@ -1134,15 +1134,15 @@ namespace OpenSim.Region.Physics.OdePlugin
if (System.Environment.OSVersion.Platform == PlatformID.Unix) if (System.Environment.OSVersion.Platform == PlatformID.Unix)
{ {
PID_D = 3200.0f; PID_D = 3200.0f;
PID_P = 1400.0f; //PID_P = 1400.0f;
} }
else else
{ {
PID_D = 2200.0f; PID_D = 2200.0f;
PID_P = 900.0f; //PID_P = 900.0f;
} }
PID_D = 1.0f; PID_D = 1.0f;
PID_P = 1.0f; //PID_P = 1.0f;
//PidStatus = true; //PidStatus = true;