ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update svn properties, minor formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2008-11-15 02:21:52 +00:00
parent 00d6114525
commit e40fe2db26
5 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@@ -1256,14 +1256,14 @@ namespace OpenSim.Region.Environment.Scenes
{
TaskInventoryItem currentItem = part.GetInventoryItem(itemID);
bool allowInventoryDrop = (part.GetEffectiveObjectFlags()
& (uint)PrimFlags.AllowInventoryDrop) != 0;
& (uint)PrimFlags.AllowInventoryDrop) != 0;
// Explicity allow anyone to add to the inventory if the
// AllowInventoryDrop flag has been set. Don't however let
// them update an item unless they pass the external checks
//
if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)
&& (currentItem != null || !allowInventoryDrop ))
&& (currentItem != null || !allowInventoryDrop))
return;
if (currentItem == null)

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

@@ -184,7 +184,7 @@ namespace OpenSim.Region.Environment.Scenes
// taskItem.SalePrice = item.SalePrice;
// taskItem.SaleType = item.SaleType;
taskItem.CreationDate = (uint)item.CreationDate;
bool addFromAllowedDrop = false;
if (remoteClient!=null)
{