diff options
| author | Jeff Ames | 2008-11-15 02:21:52 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-11-15 02:21:52 +0000 |
| commit | e40fe2db26c6fae4f52df2cc350ea1e534df441a (patch) | |
| tree | 7da025e47635ee7642bd92ec0e57d6adac9a6369 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |
| parent | * test: Add scene root agent test stub, since I'll be picking up with somethi... (diff) | |
| download | opensim-SC_OLD-e40fe2db26c6fae4f52df2cc350ea1e534df441a.zip opensim-SC_OLD-e40fe2db26c6fae4f52df2cc350ea1e534df441a.tar.gz opensim-SC_OLD-e40fe2db26c6fae4f52df2cc350ea1e534df441a.tar.bz2 opensim-SC_OLD-e40fe2db26c6fae4f52df2cc350ea1e534df441a.tar.xz | |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 74392cc..86349cb 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
| @@ -1256,14 +1256,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1256 | { | 1256 | { |
| 1257 | TaskInventoryItem currentItem = part.GetInventoryItem(itemID); | 1257 | TaskInventoryItem currentItem = part.GetInventoryItem(itemID); |
| 1258 | bool allowInventoryDrop = (part.GetEffectiveObjectFlags() | 1258 | bool allowInventoryDrop = (part.GetEffectiveObjectFlags() |
| 1259 | & (uint)PrimFlags.AllowInventoryDrop) != 0; | 1259 | & (uint)PrimFlags.AllowInventoryDrop) != 0; |
| 1260 | 1260 | ||
| 1261 | // Explicity allow anyone to add to the inventory if the | 1261 | // Explicity allow anyone to add to the inventory if the |
| 1262 | // AllowInventoryDrop flag has been set. Don't however let | 1262 | // AllowInventoryDrop flag has been set. Don't however let |
| 1263 | // them update an item unless they pass the external checks | 1263 | // them update an item unless they pass the external checks |
| 1264 | // | 1264 | // |
| 1265 | if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId) | 1265 | if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId) |
| 1266 | && (currentItem != null || !allowInventoryDrop )) | 1266 | && (currentItem != null || !allowInventoryDrop)) |
| 1267 | return; | 1267 | return; |
| 1268 | 1268 | ||
| 1269 | if (currentItem == null) | 1269 | if (currentItem == null) |