aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-11-27 19:17:54 -0500
committerTeravus Ovares (Dan Olivares)2009-11-27 19:17:54 -0500
commite7333515d95f063ce5dfe714b4cf34db85549a90 (patch)
treecf320591d49e96c67baffdb1f96c4165eafc2741 /OpenSim/Region/ClientStack
parent* Re-enable lightweight packet tracking stats on a 3000 ms interval. (diff)
parentRename TestAssetDataPlugin to MockAssetDataPlugin (diff)
downloadopensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.zip
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.gz
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.bz2
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
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 4221212..c2aa8e2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -13610,7 +13610,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
13610 if (handlerGodKickUser != null) 13610 if (handlerGodKickUser != null)
13611 { 13611 {
13612 handlerGodKickUser(gkupack.UserInfo.GodID, gkupack.UserInfo.GodSessionID, 13612 handlerGodKickUser(gkupack.UserInfo.GodID, gkupack.UserInfo.GodSessionID,
13613 gkupack.UserInfo.AgentID, (uint)0, gkupack.UserInfo.Reason); 13613 gkupack.UserInfo.AgentID, gkupack.UserInfo.KickFlags, gkupack.UserInfo.Reason,gkupack.UserInfo);
13614 } 13614 }
13615 } 13615 }
13616 else 13616 else