aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/IClientAPI.cs
diff options
context:
space:
mode:
authorMelanie2010-04-30 11:49:16 +0100
committerMelanie2010-04-30 11:49:16 +0100
commit7dc5ebc9290cc78babee6032b0d1606d6a7848cf (patch)
tree284b6ac7d547fcc4357343336d5fc66076e6085d /OpenSim/Framework/IClientAPI.cs
parentTreat a UserLevel of -1 as an unverified account and refer them to their (diff)
parentMerge branch '0.6.9-post-fixes' into careminster (diff)
downloadopensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.zip
opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.gz
opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.bz2
opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.xz
Merge branch 'careminster' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-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 af88c4a..01daeb1 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