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

Update svn properties. Minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-05-01 14:31:30 +00:00
parent bdf1262605
commit d51ce47b2d
83 changed files with 16583 additions and 16599 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -588,7 +588,6 @@ namespace OpenSim
m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor); m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor);
} }
public void handleRestartRegion(RegionInfo whichRegion) public void handleRestartRegion(RegionInfo whichRegion)
{ {
m_log.Error("[OPENSIM MAIN]: Got restart signal from SceneManager"); m_log.Error("[OPENSIM MAIN]: Got restart signal from SceneManager");

3
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -658,7 +658,6 @@ namespace OpenSim.Region.Environment.Scenes
float physicsFPS = 0; float physicsFPS = 0;
int agentsInScene = m_innerScene.GetRootAgentCount() + m_innerScene.GetChildAgentCount(); int agentsInScene = m_innerScene.GetRootAgentCount() + m_innerScene.GetChildAgentCount();
if (agentsInScene > 21) if (agentsInScene > 21)
{ {
if (m_update_entities == 1) if (m_update_entities == 1)
@ -676,7 +675,6 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
frameMS = System.Environment.TickCount; frameMS = System.Environment.TickCount;
try try
{ {
@ -687,7 +685,6 @@ namespace OpenSim.Region.Environment.Scenes
if (m_frame == Int32.MaxValue) if (m_frame == Int32.MaxValue)
m_frame = 0; m_frame = 0;
physicsMS2 = System.Environment.TickCount; physicsMS2 = System.Environment.TickCount;
if ((m_frame % m_update_physics == 0) && m_physics_enabled) if ((m_frame % m_update_physics == 0) && m_physics_enabled)
m_innerScene.UpdatePreparePhysics(); m_innerScene.UpdatePreparePhysics();

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

@ -112,7 +112,6 @@ namespace OpenSim.Region.Physics.OdePlugin
private PhysicsActor _parent = null; private PhysicsActor _parent = null;
private PhysicsActor m_taintparent = null; private PhysicsActor m_taintparent = null;
private bool iscolliding = false; private bool iscolliding = false;
private bool m_isphysical = false; private bool m_isphysical = false;
private bool m_isSelected = false; private bool m_isSelected = false;
@ -129,7 +128,6 @@ namespace OpenSim.Region.Physics.OdePlugin
public bool outofBounds = false; public bool outofBounds = false;
private float m_density = 10.000006836f; // Aluminum g/cm3; private float m_density = 10.000006836f; // Aluminum g/cm3;
public bool _zeroFlag = false; public bool _zeroFlag = false;
private bool m_lastUpdateSent = false; private bool m_lastUpdateSent = false;
@ -1761,8 +1759,8 @@ namespace OpenSim.Region.Physics.OdePlugin
public override bool Flying public override bool Flying
{ {
get { return false; //no flying prims for you // no flying prims for you
} get { return false; }
set { } set { }
} }
@ -1832,8 +1830,8 @@ namespace OpenSim.Region.Physics.OdePlugin
public override PrimitiveBaseShape Shape public override PrimitiveBaseShape Shape
{ {
set { set
{
_pbs = value; _pbs = value;
m_taintshape = true; m_taintshape = true;
} }
@ -1851,13 +1849,12 @@ namespace OpenSim.Region.Physics.OdePlugin
returnVelocity.Z = (m_lastVelocity.Z + _velocity.Z)/2; returnVelocity.Z = (m_lastVelocity.Z + _velocity.Z)/2;
return returnVelocity; return returnVelocity;
} }
set { set
{
_velocity = value; _velocity = value;
m_taintVelocity = value; m_taintVelocity = value;
_parent_scene.AddPhysicsActorTaint(this); _parent_scene.AddPhysicsActorTaint(this);
} }
} }
@ -1898,7 +1895,8 @@ namespace OpenSim.Region.Physics.OdePlugin
public override PhysicsVector RotationalVelocity public override PhysicsVector RotationalVelocity
{ {
get { get
{
PhysicsVector pv = new PhysicsVector(0, 0, 0); PhysicsVector pv = new PhysicsVector(0, 0, 0);
if (_zeroFlag) if (_zeroFlag)
return pv; return pv;
@ -1911,6 +1909,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
set { m_rotationalVelocity = value; } set { m_rotationalVelocity = value; }
} }
public override void CrossingFailure() public override void CrossingFailure()
{ {
m_crossingfailures++; m_crossingfailures++;
@ -1918,7 +1917,6 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
base.RaiseOutOfBounds(_position); base.RaiseOutOfBounds(_position);
return; return;
} }
else if (m_crossingfailures == 5) else if (m_crossingfailures == 5)
{ {
@ -1942,7 +1940,6 @@ namespace OpenSim.Region.Physics.OdePlugin
m_taintparent = null; m_taintparent = null;
} }
public override void LockAngularMotion(PhysicsVector axis) public override void LockAngularMotion(PhysicsVector axis)
{ {
// reverse the zero/non zero values for ODE. // reverse the zero/non zero values for ODE.
@ -1958,7 +1955,6 @@ namespace OpenSim.Region.Physics.OdePlugin
// no lock; called from Simulate() -- if you call this from elsewhere, gotta lock or do Monitor.Enter/Exit! // no lock; called from Simulate() -- if you call this from elsewhere, gotta lock or do Monitor.Enter/Exit!
if (_parent != null) if (_parent != null)
{ {
} }
else else
{ {
@ -1973,7 +1969,6 @@ namespace OpenSim.Region.Physics.OdePlugin
PhysicsVector l_position = new PhysicsVector(); PhysicsVector l_position = new PhysicsVector();
// kluge to keep things in bounds. ODE lets dead avatars drift away (they should be removed!) // kluge to keep things in bounds. ODE lets dead avatars drift away (they should be removed!)
//if (vec.X < 0.0f) { vec.X = 0.0f; if (Body != (IntPtr)0) d.BodySetAngularVel(Body, 0, 0, 0); } //if (vec.X < 0.0f) { vec.X = 0.0f; if (Body != (IntPtr)0) d.BodySetAngularVel(Body, 0, 0, 0); }
//if (vec.Y < 0.0f) { vec.Y = 0.0f; if (Body != (IntPtr)0) d.BodySetAngularVel(Body, 0, 0, 0); } //if (vec.Y < 0.0f) { vec.Y = 0.0f; if (Body != (IntPtr)0) d.BodySetAngularVel(Body, 0, 0, 0); }
@ -2014,7 +2009,6 @@ namespace OpenSim.Region.Physics.OdePlugin
// Disables the prim's movement physics.... // Disables the prim's movement physics....
// It's a hack and will generate a console message if it fails. // It's a hack and will generate a console message if it fails.
//IsPhysical = false; //IsPhysical = false;
if (_parent == null) if (_parent == null)
base.RaiseOutOfBounds(_position); base.RaiseOutOfBounds(_position);
@ -2052,10 +2046,8 @@ namespace OpenSim.Region.Physics.OdePlugin
_zeroFlag = false; _zeroFlag = false;
} }
if (_zeroFlag) if (_zeroFlag)
{ {
_velocity.X = 0.0f; _velocity.X = 0.0f;
_velocity.Y = 0.0f; _velocity.Y = 0.0f;
_velocity.Z = 0.0f; _velocity.Z = 0.0f;
@ -2197,8 +2189,6 @@ namespace OpenSim.Region.Physics.OdePlugin
d.JointAttach(Amotor, Body, IntPtr.Zero); d.JointAttach(Amotor, Body, IntPtr.Zero);
d.JointSetAMotorMode(Amotor, dAMotorEuler); d.JointSetAMotorMode(Amotor, dAMotorEuler);
d.JointSetAMotorNumAxes(Amotor,(int)axisnum); d.JointSetAMotorNumAxes(Amotor,(int)axisnum);
int i = 0; int i = 0;
@ -2236,10 +2226,8 @@ namespace OpenSim.Region.Physics.OdePlugin
d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0.000000000001f); d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0.000000000001f);
d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.000000000001f); d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.000000000001f);
d.JointSetAMotorParam(Amotor, (int)dParam.FudgeFactor, 0f); d.JointSetAMotorParam(Amotor, (int)dParam.FudgeFactor, 0f);
d.JointSetAMotorParam(Amotor, (int)dParam.FMax, m_tensor); d.JointSetAMotorParam(Amotor, (int)dParam.FMax, m_tensor);
} }
} }
} }

0
share/python/console/shutdown.py Normal file → Executable file
View File