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

bug fix: avoid null ref on trigger soundi if source is a avatar

httptests
UbitUmarov 2018-05-15 00:56:31 +01:00
parent 570440256b
commit f87219975d
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
View File

@ -169,6 +169,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
public virtual void TriggerSound(
UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle)
{
float radius;
SceneObjectPart part;
ScenePresence ssp = null;
if (!m_scene.TryGetSceneObjectPart(objectID, out part))
@ -177,28 +178,31 @@ namespace OpenSim.Region.CoreModules.World.Sound
return;
if (!ssp.ParcelAllowThisAvatarSounds)
return;
radius = MaxDistance;
}
else
{
SceneObjectGroup grp = part.ParentGroup;
if (grp.IsAttachment)
if(grp.IsAttachment)
{
if (!m_scene.TryGetScenePresence(grp.AttachedAvatar, out ssp))
if(!m_scene.TryGetScenePresence(grp.AttachedAvatar, out ssp))
return;
if (!ssp.ParcelAllowThisAvatarSounds)
if(!ssp.ParcelAllowThisAvatarSounds)
return;
}
}
float radius = (float)part.SoundRadius;
if (radius == 0)
{
radius = MaxDistance;
part.SoundRadius = MaxDistance;
radius = (float)part.SoundRadius;
if(radius == 0)
{
radius = MaxDistance;
part.SoundRadius = MaxDistance;
}
part.SoundFlags = 0;
}
part.SoundFlags = 0;
radius *= radius;
m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)