aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2010-04-30 11:49:16 +0100
committerMelanie2010-04-30 11:49:16 +0100
commit7dc5ebc9290cc78babee6032b0d1606d6a7848cf (patch)
tree284b6ac7d547fcc4357343336d5fc66076e6085d /OpenSim/Region/ClientStack
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/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3262419..394d4e2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -6138,7 +6138,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6138 DelinkObjects handlerDelinkObjects = OnDelinkObjects; 6138 DelinkObjects handlerDelinkObjects = OnDelinkObjects;
6139 if (handlerDelinkObjects != null) 6139 if (handlerDelinkObjects != null)
6140 { 6140 {
6141 handlerDelinkObjects(prims); 6141 handlerDelinkObjects(prims, this);
6142 } 6142 }
6143 6143
6144 return true; 6144 return true;