diff options
| author | Melanie | 2012-07-17 10:25:13 +0200 |
|---|---|---|
| committer | Melanie | 2012-07-17 10:25:13 +0200 |
| commit | 0797736fba7f87f7d9bd9d514bb318e1c7844124 (patch) | |
| tree | de4ba57287560a22d7c2d03a37ad561a965f5637 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Replace PollServiceRequestManager with older version, add extra logging to (diff) | |
| parent | fix PollServiceRequestManager (diff) | |
| download | opensim-SC_OLD-0797736fba7f87f7d9bd9d514bb318e1c7844124.zip opensim-SC_OLD-0797736fba7f87f7d9bd9d514bb318e1c7844124.tar.gz opensim-SC_OLD-0797736fba7f87f7d9bd9d514bb318e1c7844124.tar.bz2 opensim-SC_OLD-0797736fba7f87f7d9bd9d514bb318e1c7844124.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index b038876..bd11cde 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4964,7 +4964,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4964 | 4964 | ||
| 4965 | pa.OnCollisionUpdate -= PhysicsCollision; | 4965 | pa.OnCollisionUpdate -= PhysicsCollision; |
| 4966 | 4966 | ||
| 4967 | bool hassound = (CollisionSoundType >= 0 && !VolumeDetectActive); | 4967 | bool hassound = (!VolumeDetectActive && CollisionSoundType >= 0 && ((Flags & PrimFlags.Physics) != 0)); |
| 4968 | 4968 | ||
| 4969 | scriptEvents CombinedEvents = AggregateScriptEvents; | 4969 | scriptEvents CombinedEvents = AggregateScriptEvents; |
| 4970 | 4970 | ||