diff options
| author | Melanie | 2010-04-19 07:00:40 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-19 07:00:40 +0100 |
| commit | 98cb4f74b265dfb8ca3eb8c8d3ad604249398df1 (patch) | |
| tree | 1339d3707430a20662bdcd3eb4e9ef86abc6a4fd /OpenSim/Client/MXP | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | All scripts are now created suspended and are only unsuspended when the object (diff) | |
| download | opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.zip opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.gz opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.bz2 opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Client/MXP')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 17bd795..1d6d4c1 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -642,6 +642,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 642 | public event Action<UUID> OnRemoveAvatar; | 642 | public event Action<UUID> OnRemoveAvatar; |
| 643 | public event ObjectPermissions OnObjectPermissions; | 643 | public event ObjectPermissions OnObjectPermissions; |
| 644 | public event CreateNewInventoryItem OnCreateNewInventoryItem; | 644 | public event CreateNewInventoryItem OnCreateNewInventoryItem; |
| 645 | public event LinkInventoryItem OnLinkInventoryItem; | ||
| 645 | public event CreateInventoryFolder OnCreateNewInventoryFolder; | 646 | public event CreateInventoryFolder OnCreateNewInventoryFolder; |
| 646 | public event UpdateInventoryFolder OnUpdateInventoryFolder; | 647 | public event UpdateInventoryFolder OnUpdateInventoryFolder; |
| 647 | public event MoveInventoryFolder OnMoveInventoryFolder; | 648 | public event MoveInventoryFolder OnMoveInventoryFolder; |