ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Started renaming world to Scene

Browse Source 
* Update and UpdateMovement now first stores array to avoid collection update exceptions
* Ignored some bins
This commit is contained in:
lbsa71
2007-07-26 14:55:42 +00:00
parent 74654dc735
commit 39b64564dc
20 changed files with 137 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/Environment/Scenes/Entity.cs
View File

@@ -31,8 +31,8 @@ using OpenSim.Physics.Manager;
namespace OpenSim.Region.Environment.Scenes
{
public abstract class Entity :EntityBase //this class (Entity) will be phased out
{
public abstract class Entity : EntityBase //this class (Entity) will be phased out
{
protected PhysicsActor _physActor;
/// <summary>
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes
{
get
{
if (this._physActor != null)
if (_physActor != null)
{
m_pos.X = _physActor.Position.X;
m_pos.Y = _physActor.Position.Y;
@@ -53,14 +53,13 @@ namespace OpenSim.Region.Environment.Scenes
}
set
{
if (this._physActor != null)
if (_physActor != null)
{
try
{
lock (this.m_world.SyncRoot)
lock (m_scene.SyncRoot)
{
this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
_physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
}
}
catch (Exception e)
@@ -73,7 +72,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
/// <summary>
///
/// </summary>
@@ -81,7 +80,7 @@ namespace OpenSim.Region.Environment.Scenes
{
get
{
if (this._physActor != null)
if (_physActor != null)
{
m_velocity.X = _physActor.Velocity.X;
m_velocity.Y = _physActor.Velocity.Y;
@@ -92,14 +91,13 @@ namespace OpenSim.Region.Environment.Scenes
}
set
{
if (this._physActor != null)
if (_physActor != null)
{
try
{
lock (this.m_world.SyncRoot)
lock (m_scene.SyncRoot)
{
this._physActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z);
_physActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z);
}
}
catch (Exception e)
@@ -112,4 +110,4 @@ namespace OpenSim.Region.Environment.Scenes
}
}
}
}
}