Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-04-25 21:37:25 +01:00
3 changed files with 8 additions and 13 deletions

View File

@@ -320,7 +320,7 @@ namespace OpenSim.Framework
public delegate void ObjectPermissions(
IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set);
public delegate void EconomyDataRequest(UUID agentID);
public delegate void EconomyDataRequest(IClientAPI client);
public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID);