Merge branch 'master' into careminster-presence-refactor

2026-08-04 16:22:50 +08:00 · 2010-09-25 06:19:26 +01:00
parent 83b16612ce 3b76d7bbb6
commit 4fbdcb95a0
23 changed files with 231 additions and 157 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1748,7 +1748,7 @@ namespace OpenSim.Region.Framework.Scenes
        
                        part.PhysActor 
                            = m_scene.PhysicsScene.AddPrimShape(
-                                part.Name,
+                                string.Format("{0}/{1}", part.Name, part.UUID),
                                pbs,
                                part.AbsolutePosition,
                                part.Scale,