OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix more merge artefacts

avinationmerge
Melanie 2012-04-03 23:22:47 +02:00
parent 7154d480b9
commit dbec5e9859
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -4837,11 +4837,11 @@ namespace OpenSim.Region.Framework.Scenes
{ {
// Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
// (mumbles, well, at least if you have infinte CPU powers :-)) // (mumbles, well, at least if you have infinte CPU powers :-))
if (this.PhysActor != null) if (pa != null)
{ {
PhysActor.SetVolumeDetect(0); PhysActor.SetVolumeDetect(0);
this.VolumeDetectActive = false;
this.VolumeDetectActive = false; }
} }
if (SetTemporary) if (SetTemporary)