diff options
author | Justin Clark-Casey (justincc) | 2010-09-25 00:51:40 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-09-25 00:51:40 +0100 |
commit | 6325fa515d92f9d425345cc81dbc576782f81d12 (patch) | |
tree | 1932fdc3ad07134c839d8aa17150bf7e0fcdfcc1 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-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 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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, |