From 82aa8e032752cdeba2294a50c5c9288479c12cea Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 21 Nov 2008 17:35:34 +0000
Subject: * minor: Remove comparison of UUID struct against null picked up as a
 warning

---
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 96ee169..2c501e4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -3262,7 +3262,7 @@ if (m_shape != null) {
                 ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
                 ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
                 ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
-                (CollisionSound != null && CollisionSound != UUID.Zero)
+                (CollisionSound != UUID.Zero)
                 )
             {
                 // subscribe to physics updates.
-- 
cgit v1.1