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

Fix some warnings under mono.

ThreadPoolClientBranch
Jeff Ames 2008-01-11 21:08:37 +00:00
parent edf006e28a
commit ef674acc24
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
View File

@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Scenes
public bool AddInventoryItem(IClientAPI remoteClient, uint localID, public bool AddInventoryItem(IClientAPI remoteClient, uint localID,
InventoryItemBase item, LLUUID copyItemID) InventoryItemBase item, LLUUID copyItemID)
{ {
LLUUID newItemId = ((copyItemID != null) ? copyItemID : item.inventoryID); LLUUID newItemId = (!copyItemID.Equals(null)) ? copyItemID : item.inventoryID;
SceneObjectPart part = GetChildPart(localID); SceneObjectPart part = GetChildPart(localID);
if (part != null) if (part != null)

4
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
View File

@ -2372,7 +2372,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
public void llSetParcelMusicURL(string url) public void llSetParcelMusicURL(string url)
{ {
LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
if (landowner == null) if (landowner.Equals(null))
{ {
return; return;
} }
@ -2779,7 +2779,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
LLUUID reqID = httpScriptMod. LLUUID reqID = httpScriptMod.
StartHttpRequest(m_localID, m_itemID, url, param, body); StartHttpRequest(m_localID, m_itemID, url, param, body);
if (reqID != null) if (!reqID.Equals(null))
return reqID.ToString(); return reqID.ToString();
else else
return null; return null;