Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-09-25 06:19:26 +01:00
23 changed files with 231 additions and 157 deletions

View File

@@ -91,6 +91,9 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
if (part.ParentGroup.IsDeleted)
return;
if (part.OwnerID != client.AgentId && (!m_scene.Permissions.IsGod(client.AgentId)))
return;
part = part.ParentGroup.RootPart;
part.ObjectSaleType = saleType;
@@ -258,4 +261,4 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
return true;
}
}
}
}