diff options
| author | Kitto Flora | 2009-09-30 19:05:39 +0200 |
|---|---|---|
| committer | Kitto Flora | 2009-09-30 19:05:39 +0200 |
| commit | d43f739cef2c31200ab297d596b073da29972118 (patch) | |
| tree | 230834107ad3c7fcc943665c1d7cfaf56fd4b112 | |
| parent | And another (diff) | |
| download | opensim-SC_OLD-d43f739cef2c31200ab297d596b073da29972118.zip opensim-SC_OLD-d43f739cef2c31200ab297d596b073da29972118.tar.gz opensim-SC_OLD-d43f739cef2c31200ab297d596b073da29972118.tar.bz2 opensim-SC_OLD-d43f739cef2c31200ab297d596b073da29972118.tar.xz | |
And another merge issue
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index d983b75..9819163 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -3485,6 +3485,7 @@ if (m_shape != null) { | |||
| 3485 | else | 3485 | else |
| 3486 | { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like | 3486 | { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like |
| 3487 | // (mumbles, well, at least if you have infinte CPU powers :-)) | 3487 | // (mumbles, well, at least if you have infinte CPU powers :-)) |
| 3488 | PhysicsActor pa = this.PhysActor; | ||
| 3488 | if (pa != null) | 3489 | if (pa != null) |
| 3489 | { | 3490 | { |
| 3490 | PhysActor.SetVolumeDetect(0); | 3491 | PhysActor.SetVolumeDetect(0); |