aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-25 00:51:40 +0100
committerJustin Clark-Casey (justincc)2010-09-25 00:51:40 +0100
commit6325fa515d92f9d425345cc81dbc576782f81d12 (patch)
tree1932fdc3ad07134c839d8aa17150bf7e0fcdfcc1
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-6325fa515d92f9d425345cc81dbc576782f81d12.zip
opensim-SC_OLD-6325fa515d92f9d425345cc81dbc576782f81d12.tar.gz
opensim-SC_OLD-6325fa515d92f9d425345cc81dbc576782f81d12.tar.bz2
opensim-SC_OLD-6325fa515d92f9d425345cc81dbc576782f81d12.tar.xz
Add UUID to physics prim name parameter so that diagnostic messages can be made more useful.
If a separate UUID parameter is better for the future then this can be added later on.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b655f39..5513584 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1434,7 +1434,7 @@ namespace OpenSim.Region.Framework.Scenes
1434 1434
1435 part.PhysActor 1435 part.PhysActor
1436 = m_scene.PhysicsScene.AddPrimShape( 1436 = m_scene.PhysicsScene.AddPrimShape(
1437 part.Name, 1437 string.Format("{0}/{1}", part.Name, part.UUID),
1438 pbs, 1438 pbs,
1439 part.AbsolutePosition, 1439 part.AbsolutePosition,
1440 part.Scale, 1440 part.Scale,
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 95cd26f..a8e76e3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1534,7 +1534,7 @@ namespace OpenSim.Region.Framework.Scenes
1534 if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible)) 1534 if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible))
1535 { 1535 {
1536 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 1536 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
1537 Name, 1537 string.Format("{0}/{1}", Name, UUID),
1538 Shape, 1538 Shape,
1539 AbsolutePosition, 1539 AbsolutePosition,
1540 Scale, 1540 Scale,
@@ -4368,7 +4368,7 @@ namespace OpenSim.Region.Framework.Scenes
4368 { 4368 {
4369 // It's not phantom anymore. So make sure the physics engine get's knowledge of it 4369 // It's not phantom anymore. So make sure the physics engine get's knowledge of it
4370 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 4370 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
4371 Name, 4371 string.Format("{0}/{1}", Name, UUID),
4372 Shape, 4372 Shape,
4373 AbsolutePosition, 4373 AbsolutePosition,
4374 Scale, 4374 Scale,