diff options
| author | KittoFlora | 2009-11-15 22:20:51 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-15 22:20:51 +0100 |
| commit | ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee (patch) | |
| tree | e218f290178d98e63aa8ab6aef46c1715195c32e /OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Make GroupRootUpdate be a terse update. This method is not used by opensim (i... (diff) | |
| download | opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.zip opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.gz opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.bz2 opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Client/MXP/ClientStack/MXPClientView.cs')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 204603d..0cae3dd 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -676,6 +676,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 676 | public event FriendActionDelegate OnApproveFriendRequest; | 676 | public event FriendActionDelegate OnApproveFriendRequest; |
| 677 | public event FriendActionDelegate OnDenyFriendRequest; | 677 | public event FriendActionDelegate OnDenyFriendRequest; |
| 678 | public event FriendshipTermination OnTerminateFriendship; | 678 | public event FriendshipTermination OnTerminateFriendship; |
| 679 | public event GrantUserFriendRights OnGrantUserRights; | ||
| 679 | public event MoneyTransferRequest OnMoneyTransferRequest; | 680 | public event MoneyTransferRequest OnMoneyTransferRequest; |
| 680 | public event EconomyDataRequest OnEconomyDataRequest; | 681 | public event EconomyDataRequest OnEconomyDataRequest; |
| 681 | public event MoneyBalanceRequest OnMoneyBalanceRequest; | 682 | public event MoneyBalanceRequest OnMoneyBalanceRequest; |
| @@ -1052,7 +1053,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 1052 | { | 1053 | { |
| 1053 | } | 1054 | } |
| 1054 | 1055 | ||
| 1055 | public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, bool fetchFolders, bool fetchItems) | 1056 | public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems) |
| 1056 | { | 1057 | { |
| 1057 | // Need to translate to MXP somehow | 1058 | // Need to translate to MXP somehow |
| 1058 | } | 1059 | } |