aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorsacha2010-05-02 08:18:33 -0400
committersacha2010-05-02 08:18:33 -0400
commit5f6e9e6ab954518e45fd47434a17686f925941f4 (patch)
tree46e35df9931238dba4d45354e54e0b1f78f34dca /OpenSim/Framework
parentAdding DebugEvent Trap (diff)
parentFix linking issue introduced in my earlier commit (diff)
downloadopensim-SC-5f6e9e6ab954518e45fd47434a17686f925941f4.zip
opensim-SC-5f6e9e6ab954518e45fd47434a17686f925941f4.tar.gz
opensim-SC-5f6e9e6ab954518e45fd47434a17686f925941f4.tar.bz2
opensim-SC-5f6e9e6ab954518e45fd47434a17686f925941f4.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/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