Fix more merge artefacts
parent
7154d480b9
commit
dbec5e9859
|
@ -4837,12 +4837,12 @@ 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)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue