diff options
| author | Jeff Ames | 2008-09-21 02:41:22 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-09-21 02:41:22 +0000 |
| commit | c8349e21c43b1232aa923783a39cca224460551a (patch) | |
| tree | 883f756507ea9984f5e7d56a4aa507d0640b57ee /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
| parent | Fix an exception in new ScriptEngine loader where a region would (diff) | |
| download | opensim-SC-c8349e21c43b1232aa923783a39cca224460551a.zip opensim-SC-c8349e21c43b1232aa923783a39cca224460551a.tar.gz opensim-SC-c8349e21c43b1232aa923783a39cca224460551a.tar.bz2 opensim-SC-c8349e21c43b1232aa923783a39cca224460551a.tar.xz | |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index c1077f8..2e75486 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1335 | 1335 | ||
| 1336 | IMesh mesh = null; | 1336 | IMesh mesh = null; |
| 1337 | 1337 | ||
| 1338 | if(_parent_scene.needsMeshing(_pbs)) | 1338 | if (_parent_scene.needsMeshing(_pbs)) |
| 1339 | mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); | 1339 | mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); |
| 1340 | 1340 | ||
| 1341 | //IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); | 1341 | //IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); |
| @@ -2303,7 +2303,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2303 | 2303 | ||
| 2304 | base.SendCollisionUpdate(CollisionEventsThisFrame); | 2304 | base.SendCollisionUpdate(CollisionEventsThisFrame); |
| 2305 | 2305 | ||
| 2306 | if(CollisionEventsThisFrame.m_objCollisionList.Count == 0) | 2306 | if (CollisionEventsThisFrame.m_objCollisionList.Count == 0) |
| 2307 | CollisionEventsThisFrame = null; | 2307 | CollisionEventsThisFrame = null; |
| 2308 | else | 2308 | else |
| 2309 | CollisionEventsThisFrame = new CollisionEventUpdate(); | 2309 | CollisionEventsThisFrame = new CollisionEventUpdate(); |