Merge branch 'master' into careminster

This commit is contained in:
Melanie
2009-11-26 17:27:03 +00:00
20 changed files with 194 additions and 147 deletions

View File

@@ -3807,10 +3807,5 @@ namespace OpenSim.Region.Framework.Scenes
Inventory.ApplyNextOwnerPermissions();
}
public bool CanBeDeleted()
{
return Inventory.CanBeDeleted();
}
}
}