From 516ee244b4f8f493b9b76a62b62f4e8304826e4f Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Fri, 5 Oct 2012 14:30:51 +0100
Subject: swapping GetSceneObjectPart for TryGetSceneObjectPart in
PlayAttachedSound to imply why we're doing an early return.
---
OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs
index 74f2874..917b3dc 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs
@@ -106,8 +106,8 @@ namespace OpenSim.Region.CoreModules.World.Sound
public virtual void PlayAttachedSound(
UUID soundID, UUID ownerID, UUID objectID, double gain, Vector3 position, byte flags, float radius)
{
- SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
- if (part == null)
+ SceneObjectPart part;
+ if (!m_scene.TryGetSceneObjectPart(objectID, out part))
return;
SceneObjectGroup grp = part.ParentGroup;
@@ -141,8 +141,8 @@ 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 = m_scene.GetSceneObjectPart(objectID);
- if (part == null)
+ SceneObjectPart part;
+ if (!m_scene.TryGetSceneObjectPart(objectID, out part))
{
ScenePresence sp;
if (!m_scene.TryGetScenePresence(objectID, out sp))
--
cgit v1.1