aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-07 03:40:01 +0200
committerMelanie Thielker2010-08-07 03:40:01 +0200
commit7477d7a0369402b6c6c6d41712e578060f8926e8 (patch)
tree6636d4a2318b552420fbdfcf9a29e31dc3cb62b2 /OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
parentMake the landmark properties and search places work again (diff)
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-7477d7a0369402b6c6c6d41712e578060f8926e8.zip
opensim-SC_OLD-7477d7a0369402b6c6c6d41712e578060f8926e8.tar.gz
opensim-SC_OLD-7477d7a0369402b6c6c6d41712e578060f8926e8.tar.bz2
opensim-SC_OLD-7477d7a0369402b6c6c6d41712e578060f8926e8.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs')
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 2063616..6ad5f5a 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -253,6 +253,7 @@ namespace OpenSim.Client.Sirikata.ClientStack
253 public event AddNewPrim OnAddPrim; 253 public event AddNewPrim OnAddPrim;
254 public event FetchInventory OnAgentDataUpdateRequest; 254 public event FetchInventory OnAgentDataUpdateRequest;
255 public event TeleportLocationRequest OnSetStartLocationRequest; 255 public event TeleportLocationRequest OnSetStartLocationRequest;
256 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
256 public event RequestGodlikePowers OnRequestGodlikePowers; 257 public event RequestGodlikePowers OnRequestGodlikePowers;
257 public event GodKickUser OnGodKickUser; 258 public event GodKickUser OnGodKickUser;
258 public event ObjectDuplicate OnObjectDuplicate; 259 public event ObjectDuplicate OnObjectDuplicate;