aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2010-04-30 11:48:57 +0100
committerMelanie2010-04-30 11:48:57 +0100
commit8b70477556a5467868bf6b771da8bb5a366f3160 (patch)
treef44e1e120072848270abc38e9eee374b2d5792c0 /OpenSim/Framework
parentFix Av jump motion S/W (diff)
parentFix link security issue (diff)
downloadopensim-SC-8b70477556a5467868bf6b771da8bb5a366f3160.zip
opensim-SC-8b70477556a5467868bf6b771da8bb5a366f3160.tar.gz
opensim-SC-8b70477556a5467868bf6b771da8bb5a366f3160.tar.bz2
opensim-SC-8b70477556a5467868bf6b771da8bb5a366f3160.tar.xz
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 06c5094..bcbc957 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Framework
73 73
74 public delegate void LinkObjects(IClientAPI remoteClient, uint parent, List<uint> children); 74 public delegate void LinkObjects(IClientAPI remoteClient, uint parent, List<uint> children);
75 75
76 public delegate void DelinkObjects(List<uint> primIds); 76 public delegate void DelinkObjects(List<uint> primIds, IClientAPI client);
77 77
78 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag); 78 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag);
79 79