diff options
| author | Diva Canto | 2013-04-25 17:02:32 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-04-25 17:02:32 -0700 |
| commit | 2262b130482d54e6d61beacf9a403e2154f10019 (patch) | |
| tree | 6f719236db779bcc5492bb6ef9ccc1d4d5c2089c /OpenSim/Framework | |
| parent | Groups: make some methods protected. (diff) | |
| parent | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. Th... (diff) | |
| download | opensim-SC-2262b130482d54e6d61beacf9a403e2154f10019.zip opensim-SC-2262b130482d54e6d61beacf9a403e2154f10019.tar.gz opensim-SC-2262b130482d54e6d61beacf9a403e2154f10019.tar.bz2 opensim-SC-2262b130482d54e6d61beacf9a403e2154f10019.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -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 10ead39..4d5ec3a 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -313,7 +313,7 @@ namespace OpenSim.Framework | |||
| 313 | public delegate void ObjectPermissions( | 313 | public delegate void ObjectPermissions( |
| 314 | IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set); | 314 | IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set); |
| 315 | 315 | ||
| 316 | public delegate void EconomyDataRequest(UUID agentID); | 316 | public delegate void EconomyDataRequest(IClientAPI client); |
| 317 | 317 | ||
| 318 | public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID); | 318 | public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID); |
| 319 | 319 | ||