diff options
| author | Melanie | 2010-09-25 06:19:26 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-25 06:19:26 +0100 |
| commit | 4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd (patch) | |
| tree | 1e69a75f208cc7065bdd196bb99d13adfb5003b5 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Experimental locking of taint processing (diff) | |
| parent | Fix a minor economy issue (diff) | |
| download | opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.zip opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.tar.gz opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.tar.bz2 opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 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, |