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/Sirikata/ClientStack | |
| 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/Sirikata/ClientStack')
| -rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index 4ecbaf9..43c64e9 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
| @@ -288,6 +288,7 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
| 288 | public event Action<UUID> OnRemoveAvatar; | 288 | public event Action<UUID> OnRemoveAvatar; |
| 289 | public event ObjectPermissions OnObjectPermissions; | 289 | public event ObjectPermissions OnObjectPermissions; |
| 290 | public event CreateNewInventoryItem OnCreateNewInventoryItem; | 290 | public event CreateNewInventoryItem OnCreateNewInventoryItem; |
| 291 | public event LinkInventoryItem OnLinkInventoryItem; | ||
| 291 | public event CreateInventoryFolder OnCreateNewInventoryFolder; | 292 | public event CreateInventoryFolder OnCreateNewInventoryFolder; |
| 292 | public event UpdateInventoryFolder OnUpdateInventoryFolder; | 293 | public event UpdateInventoryFolder OnUpdateInventoryFolder; |
| 293 | public event MoveInventoryFolder OnMoveInventoryFolder; | 294 | public event MoveInventoryFolder OnMoveInventoryFolder; |