aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs7
3 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c94a873..a9502ed 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1748,7 +1748,7 @@ namespace OpenSim.Region.Framework.Scenes
1748 1748
1749 part.PhysActor 1749 part.PhysActor
1750 = m_scene.PhysicsScene.AddPrimShape( 1750 = m_scene.PhysicsScene.AddPrimShape(
1751 part.Name, 1751 string.Format("{0}/{1}", part.Name, part.UUID),
1752 pbs, 1752 pbs,
1753 part.AbsolutePosition, 1753 part.AbsolutePosition,
1754 part.Scale, 1754 part.Scale,
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 40112c9..9bb961d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1560,7 +1560,7 @@ namespace OpenSim.Region.Framework.Scenes
1560 try 1560 try
1561 { 1561 {
1562 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 1562 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
1563 Name, 1563 string.Format("{0}/{1}", Name, UUID),
1564 Shape, 1564 Shape,
1565 AbsolutePosition, 1565 AbsolutePosition,
1566 Scale, 1566 Scale,
@@ -4396,7 +4396,7 @@ namespace OpenSim.Region.Framework.Scenes
4396 { 4396 {
4397 // It's not phantom anymore. So make sure the physics engine get's knowledge of it 4397 // It's not phantom anymore. So make sure the physics engine get's knowledge of it
4398 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 4398 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
4399 Name, 4399 string.Format("{0}/{1}", Name, UUID),
4400 Shape, 4400 Shape,
4401 AbsolutePosition, 4401 AbsolutePosition,
4402 Scale, 4402 Scale,
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 65baa52..aee2d10 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -291,9 +291,16 @@ namespace OpenSim.Region.Framework.Scenes
291 } 291 }
292 } 292 }
293 293
294 /// <summary>
295 /// Get the asset uuid associated with a gesture
296 /// </summary>
297 /// <param name="gestureUuid"></param>
298 /// <param name="assetUuids"></param>
294 protected void GetGestureAssetUuids(UUID gestureUuid, IDictionary<UUID, AssetType> assetUuids) 299 protected void GetGestureAssetUuids(UUID gestureUuid, IDictionary<UUID, AssetType> assetUuids)
295 { 300 {
296 AssetBase assetBase = GetAsset(gestureUuid); 301 AssetBase assetBase = GetAsset(gestureUuid);
302 if (null == assetBase)
303 return;
297 304
298 MemoryStream ms = new MemoryStream(assetBase.Data); 305 MemoryStream ms = new MemoryStream(assetBase.Data);
299 StreamReader sr = new StreamReader(ms); 306 StreamReader sr = new StreamReader(ms);