diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-16 12:15:14 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-16 12:15:14 -0400 |
commit | acc14c472deeb92e0436ac38d16e3f6e049bc546 (patch) | |
tree | b31fd0fd1992c1ea6cad2cc1123ab2422953372f /OpenSim/Framework/IClientAPI.cs | |
parent | * ShortVersion, another attempt at fixing the test thread death that randomly... (diff) | |
parent | * Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment (diff) | |
download | opensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.zip opensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.gz opensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.bz2 opensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 1594c44..e451dd8 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -111,6 +111,8 @@ namespace OpenSim.Framework | |||
111 | 111 | ||
112 | public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); | 112 | public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); |
113 | 113 | ||
114 | public delegate void ObjectRequest(uint localID, IClientAPI remoteClient); | ||
115 | |||
114 | public delegate void RequestObjectPropertiesFamily( | 116 | public delegate void RequestObjectPropertiesFamily( |
115 | IClientAPI remoteClient, UUID AgentID, uint RequestFlags, UUID TaskID); | 117 | IClientAPI remoteClient, UUID AgentID, uint RequestFlags, UUID TaskID); |
116 | 118 | ||
@@ -622,6 +624,7 @@ namespace OpenSim.Framework | |||
622 | 624 | ||
623 | event UpdateShape OnUpdatePrimShape; | 625 | event UpdateShape OnUpdatePrimShape; |
624 | event ObjectExtraParams OnUpdateExtraParams; | 626 | event ObjectExtraParams OnUpdateExtraParams; |
627 | event ObjectRequest OnObjectRequest; | ||
625 | event ObjectSelect OnObjectSelect; | 628 | event ObjectSelect OnObjectSelect; |
626 | event ObjectDeselect OnObjectDeselect; | 629 | event ObjectDeselect OnObjectDeselect; |
627 | event GenericCall7 OnObjectDescription; | 630 | event GenericCall7 OnObjectDescription; |