diff options
| author | Jeff Ames | 2008-01-11 21:08:37 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-01-11 21:08:37 +0000 |
| commit | ef674acc245785ddf757c6b8f3b7765ff7905a54 (patch) | |
| tree | eb1ccb01c0725a71d21b27d9463c6a84b5701d09 /OpenSim/Region/Environment/Scenes | |
| parent | Fill out and add wiki link to OpenSim.ini.example for prim inventory persistence (diff) | |
| download | opensim-SC-ef674acc245785ddf757c6b8f3b7765ff7905a54.zip opensim-SC-ef674acc245785ddf757c6b8f3b7765ff7905a54.tar.gz opensim-SC-ef674acc245785ddf757c6b8f3b7765ff7905a54.tar.bz2 opensim-SC-ef674acc245785ddf757c6b8f3b7765ff7905a54.tar.xz | |
Fix some warnings under mono.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 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) |