aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/IClientAPI.cs
diff options
context:
space:
mode:
authorAdam Frisby2009-08-16 21:21:38 +1000
committerAdam Frisby2009-08-16 21:21:38 +1000
commitaea4d7c63b64ee06e51725acb6d1e48c971b26d8 (patch)
treef2be39d773040ea117f194f2a341e1df0adc2c60 /OpenSim/Framework/IClientAPI.cs
parent* [MRM] Implements permission checks on IObject implementations in SOPObject.... (diff)
parentAdd copyright headers. Formatting cleanup. (diff)
downloadopensim-SC-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.zip
opensim-SC-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.tar.gz
opensim-SC-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.tar.bz2
opensim-SC-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r--OpenSim/Framework/IClientAPI.cs3
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;