diff options
| author | Melanie | 2012-03-31 02:18:02 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-31 02:18:02 +0100 |
| commit | f3132c45d98af7bb38251ad95013c433b5eda9e5 (patch) | |
| tree | efc3d6c0529678c0a56f5a505a52944012ea607a /OpenSim/Framework/IClientAPI.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the... (diff) | |
| download | opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.zip opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.gz opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.bz2 opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 881f815..2be78da 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -301,9 +301,9 @@ namespace OpenSim.Framework | |||
| 301 | public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID); | 301 | public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID); |
| 302 | 302 | ||
| 303 | public delegate void FriendActionDelegate( | 303 | public delegate void FriendActionDelegate( |
| 304 | IClientAPI remoteClient, UUID agentID, UUID transactionID, List<UUID> callingCardFolders); | 304 | IClientAPI remoteClient, UUID transactionID, List<UUID> callingCardFolders); |
| 305 | 305 | ||
| 306 | public delegate void FriendshipTermination(IClientAPI remoteClient, UUID agentID, UUID ExID); | 306 | public delegate void FriendshipTermination(IClientAPI remoteClient, UUID ExID); |
| 307 | 307 | ||
| 308 | public delegate void MoneyTransferRequest( | 308 | public delegate void MoneyTransferRequest( |
| 309 | UUID sourceID, UUID destID, int amount, int transactionType, string description); | 309 | UUID sourceID, UUID destID, int amount, int transactionType, string description); |
| @@ -464,7 +464,7 @@ namespace OpenSim.Framework | |||
| 464 | public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes); | 464 | public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes); |
| 465 | public delegate void MuteListRequest(IClientAPI client, uint muteCRC); | 465 | public delegate void MuteListRequest(IClientAPI client, uint muteCRC); |
| 466 | public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages); | 466 | public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages); |
| 467 | public delegate void GrantUserFriendRights(IClientAPI client, UUID requester, UUID target, int rights); | 467 | public delegate void GrantUserFriendRights(IClientAPI client, UUID target, int rights); |
| 468 | public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client); | 468 | public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client); |
| 469 | 469 | ||
| 470 | public delegate void AgentFOV(IClientAPI client, float verticalAngle); | 470 | public delegate void AgentFOV(IClientAPI client, float verticalAngle); |