diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/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 d694f67..a092f5b 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 | |||
162 | public bool AddInventoryItem(IClientAPI remoteClient, uint localID, | 162 | public bool AddInventoryItem(IClientAPI remoteClient, uint localID, |
163 | InventoryItemBase item, LLUUID copyItemID) | 163 | InventoryItemBase item, LLUUID copyItemID) |
164 | { | 164 | { |
165 | LLUUID newItemId = ((copyItemID != null) ? copyItemID : item.inventoryID); | 165 | LLUUID newItemId = (!copyItemID.Equals(null)) ? copyItemID : item.inventoryID; |
166 | 166 | ||
167 | SceneObjectPart part = GetChildPart(localID); | 167 | SceneObjectPart part = GetChildPart(localID); |
168 | if (part != null) | 168 | 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 0ad10cc..b7fe241 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 | |||
2372 | public void llSetParcelMusicURL(string url) | 2372 | public void llSetParcelMusicURL(string url) |
2373 | { | 2373 | { |
2374 | LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | 2374 | LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); |
2375 | if (landowner == null) | 2375 | if (landowner.Equals(null)) |
2376 | { | 2376 | { |
2377 | return; | 2377 | return; |
2378 | } | 2378 | } |
@@ -2779,7 +2779,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
2779 | LLUUID reqID = httpScriptMod. | 2779 | LLUUID reqID = httpScriptMod. |
2780 | StartHttpRequest(m_localID, m_itemID, url, param, body); | 2780 | StartHttpRequest(m_localID, m_itemID, url, param, body); |
2781 | 2781 | ||
2782 | if (reqID != null) | 2782 | if (!reqID.Equals(null)) |
2783 | return reqID.ToString(); | 2783 | return reqID.ToString(); |
2784 | else | 2784 | else |
2785 | return null; | 2785 | return null; |