diff options
| author | Jeff Ames | 2008-03-19 09:36:13 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-03-19 09:36:13 +0000 |
| commit | a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f (patch) | |
| tree | be64babdd6f1bcb2a946d637b81739445facdd31 /OpenSim/Region/Environment/Scenes | |
| parent | * Add a large amount of extra locking to m_parts in SceneObjectGroup (diff) | |
| download | opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.zip opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.gz opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.bz2 opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.xz | |
Fixed some comparisons of LLUUIDs to null.
Thanks to DrSchofld for pointing this out.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index e02faaf..967ba0b 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | |||
| @@ -178,8 +178,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 178 | public bool AddInventoryItem(IClientAPI remoteClient, uint localID, | 178 | public bool AddInventoryItem(IClientAPI remoteClient, uint localID, |
| 179 | InventoryItemBase item, LLUUID copyItemID) | 179 | InventoryItemBase item, LLUUID copyItemID) |
| 180 | { | 180 | { |
| 181 | LLUUID newItemId = (!copyItemID.Equals(null)) ? copyItemID : item.inventoryID; | 181 | LLUUID newItemId = (copyItemID != LLUUID.Zero) ? copyItemID : item.inventoryID; |
| 182 | 182 | ||
| 183 | SceneObjectPart part = GetChildPart(localID); | 183 | SceneObjectPart part = GetChildPart(localID); |
| 184 | if (part != null) | 184 | if (part != null) |
| 185 | { | 185 | { |