diff options
| author | Melanie | 2013-04-25 21:37:25 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-25 21:37:25 +0100 |
| commit | fb8aa220845c13872dbeae58efc6183ded7f7f52 (patch) | |
| tree | fdc05e151953f1261cb9f66421edc7a4dc8bb46b /OpenSim/Framework/IClientAPI.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. Th... (diff) | |
| download | opensim-SC_OLD-fb8aa220845c13872dbeae58efc6183ded7f7f52.zip opensim-SC_OLD-fb8aa220845c13872dbeae58efc6183ded7f7f52.tar.gz opensim-SC_OLD-fb8aa220845c13872dbeae58efc6183ded7f7f52.tar.bz2 opensim-SC_OLD-fb8aa220845c13872dbeae58efc6183ded7f7f52.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 655ba8a..c88828b 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -320,7 +320,7 @@ namespace OpenSim.Framework | |||
| 320 | public delegate void ObjectPermissions( | 320 | public delegate void ObjectPermissions( |
| 321 | IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set); | 321 | IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set); |
| 322 | 322 | ||
| 323 | public delegate void EconomyDataRequest(UUID agentID); | 323 | public delegate void EconomyDataRequest(IClientAPI client); |
| 324 | 324 | ||
| 325 | public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID); | 325 | public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID); |
| 326 | 326 | ||