diff options
| author | Justin Clark-Casey (justincc) | 2011-07-21 03:10:28 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-07-21 03:10:28 +0100 |
| commit | 703d130e965339a2432ff9619721f02206be7d24 (patch) | |
| tree | fb5d58135d6e7af00d773b7dd54d4e26586523c7 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | make default TextureOnMapTile true for the older map imager (diff) | |
| parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
| download | opensim-SC_OLD-703d130e965339a2432ff9619721f02206be7d24.zip opensim-SC_OLD-703d130e965339a2432ff9619721f02206be7d24.tar.gz opensim-SC_OLD-703d130e965339a2432ff9619721f02206be7d24.tar.bz2 opensim-SC_OLD-703d130e965339a2432ff9619721f02206be7d24.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index f74f263..4629757 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4533,7 +4533,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4533 | { | 4533 | { |
| 4534 | // It's not phantom anymore. So make sure the physics engine get's knowledge of it | 4534 | // It's not phantom anymore. So make sure the physics engine get's knowledge of it |
| 4535 | PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( | 4535 | PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( |
| 4536 | LocalId, | ||
| 4537 | string.Format("{0}/{1}", Name, UUID), | 4536 | string.Format("{0}/{1}", Name, UUID), |
| 4538 | Shape, | 4537 | Shape, |
| 4539 | AbsolutePosition, | 4538 | AbsolutePosition, |