aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-03 05:25:23 +0200
committerMelanie Thielker2010-08-03 05:25:23 +0200
commite3184753a6956078a2e34c449d5e30843b5d7f94 (patch)
tree2d35f9771c3427790158fb8681944c1659f66c36 /OpenSim
parentRevert "Catch meshing error in Meshmerizer" (diff)
downloadopensim-SC_OLD-e3184753a6956078a2e34c449d5e30843b5d7f94.zip
opensim-SC_OLD-e3184753a6956078a2e34c449d5e30843b5d7f94.tar.gz
opensim-SC_OLD-e3184753a6956078a2e34c449d5e30843b5d7f94.tar.bz2
opensim-SC_OLD-e3184753a6956078a2e34c449d5e30843b5d7f94.tar.xz
Log the UUID of a prim that fails meshing and set the prim to phantom during
region startup
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs23
1 files changed, 15 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b19c443..032fbe8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1497,14 +1497,21 @@ namespace OpenSim.Region.Framework.Scenes
1497 // or flexible 1497 // or flexible
1498 if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible)) 1498 if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible))
1499 { 1499 {
1500 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 1500 try
1501 Name, 1501 {
1502 Shape, 1502 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
1503 AbsolutePosition, 1503 Name,
1504 Scale, 1504 Shape,
1505 RotationOffset, 1505 AbsolutePosition,
1506 RigidBody); 1506 Scale,
1507 1507 RotationOffset,
1508 RigidBody);
1509 }
1510 catch
1511 {
1512 m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom.", m_uuid);
1513 PhysActor = null;
1514 }
1508 // Basic Physics returns null.. joy joy joy. 1515 // Basic Physics returns null.. joy joy joy.
1509 if (PhysActor != null) 1516 if (PhysActor != null)
1510 { 1517 {