aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorMelanie2009-11-28 09:26:00 +0000
committerMelanie2009-11-28 09:26:00 +0000
commitd3e7a5293310651ea8adf28327e1cb9840bcf9d7 (patch)
tree044fde70d244eecd8c1344eb973aa8d6e86e249b /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentReset update flag when a SOG is deleted. This fixes llDie(); (diff)
parentAdd some conditionals to references to the WorldComm module, so that the (diff)
downloadopensim-SC-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.zip
opensim-SC-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.gz
opensim-SC-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.bz2
opensim-SC-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-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 ac16b02..b588a2e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -13593,7 +13593,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
13593 if (handlerGodKickUser != null) 13593 if (handlerGodKickUser != null)
13594 { 13594 {
13595 handlerGodKickUser(gkupack.UserInfo.GodID, gkupack.UserInfo.GodSessionID, 13595 handlerGodKickUser(gkupack.UserInfo.GodID, gkupack.UserInfo.GodSessionID,
13596 gkupack.UserInfo.AgentID, (uint)0, gkupack.UserInfo.Reason); 13596 gkupack.UserInfo.AgentID, gkupack.UserInfo.KickFlags, gkupack.UserInfo.Reason,gkupack.UserInfo);
13597 } 13597 }
13598 } 13598 }
13599 else 13599 else