diff options
| author | Melanie | 2011-07-23 18:34:46 +0200 |
|---|---|---|
| committer | Melanie | 2011-07-23 18:34:46 +0200 |
| commit | 2e83b48873ae93776c257d6b829a14473a0a3a0d (patch) | |
| tree | c0cfc4fe60fc840ba992cf9b59c9fe8239f72a48 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Fix failure to find avatars due to trainling spaces being sent by viewers. (diff) | |
| parent | Fix LLTextBox to work with the updated libOMV (diff) | |
| download | opensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.zip opensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.tar.gz opensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.tar.bz2 opensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
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 2214f2f..037f384 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4437,7 +4437,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4437 | { | 4437 | { |
| 4438 | // It's not phantom anymore. So make sure the physics engine get's knowledge of it | 4438 | // It's not phantom anymore. So make sure the physics engine get's knowledge of it |
| 4439 | PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( | 4439 | PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( |
| 4440 | LocalId, | ||
| 4441 | string.Format("{0}/{1}", Name, UUID), | 4440 | string.Format("{0}/{1}", Name, UUID), |
| 4442 | Shape, | 4441 | Shape, |
| 4443 | AbsolutePosition, | 4442 | AbsolutePosition, |