From ef674acc245785ddf757c6b8f3b7765ff7905a54 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 11 Jan 2008 21:08:37 +0000 Subject: [PATCH] Fix some warnings under mono. --- .../Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 2 +- .../DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index d694f67e32..a092f5b6f2 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs @@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Scenes public bool AddInventoryItem(IClientAPI remoteClient, uint localID, InventoryItemBase item, LLUUID copyItemID) { - LLUUID newItemId = ((copyItemID != null) ? copyItemID : item.inventoryID); + LLUUID newItemId = (!copyItemID.Equals(null)) ? copyItemID : item.inventoryID; SceneObjectPart part = GetChildPart(localID); if (part != null) diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index 0ad10cc050..b7fe24141a 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs @@ -2372,7 +2372,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler public void llSetParcelMusicURL(string url) { LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); - if (landowner == null) + if (landowner.Equals(null)) { return; } @@ -2779,7 +2779,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler LLUUID reqID = httpScriptMod. StartHttpRequest(m_localID, m_itemID, url, param, body); - if (reqID != null) + if (!reqID.Equals(null)) return reqID.ToString(); else return null;