diff options
| author | Melanie | 2010-06-19 20:32:01 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-19 20:32:01 +0100 |
| commit | 04b60aa49067060779cd541e9a06ad947bfecd08 (patch) | |
| tree | d0da6005a2457640f433fe1b313e36cb71cc3976 /OpenSim/Region/Framework | |
| parent | Allow moving an avatar as part of a linkset using llSetLinkPrimitiveParams. T... (diff) | |
| parent | Bug fix: wrong name of requester in local friendship offer. (diff) | |
| download | opensim-SC-04b60aa49067060779cd541e9a06ad947bfecd08.zip opensim-SC-04b60aa49067060779cd541e9a06ad947bfecd08.tar.gz opensim-SC-04b60aa49067060779cd541e9a06ad947bfecd08.tar.bz2 opensim-SC-04b60aa49067060779cd541e9a06ad947bfecd08.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index b80a557..7403fed 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -1498,6 +1498,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1498 | DoPhysicsPropertyUpdate(RigidBody, true); | 1498 | DoPhysicsPropertyUpdate(RigidBody, true); |
| 1499 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); | 1499 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); |
| 1500 | } | 1500 | } |
| 1501 | else | ||
| 1502 | { | ||
| 1503 | m_log.DebugFormat("[SPEW]: physics actor is null for {0} with parent {1}", UUID, this.ParentGroup.UUID); | ||
| 1504 | } | ||
| 1501 | } | 1505 | } |
| 1502 | } | 1506 | } |
| 1503 | } | 1507 | } |