diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index 8cf4619..e95d2f8 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -1206,7 +1206,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
1206 | { | 1206 | { |
1207 | Scene homeScene = GetRootScene(); | 1207 | Scene homeScene = GetRootScene(); |
1208 | ScenePresence avatar = null; | 1208 | ScenePresence avatar = null; |
1209 | if (homeScene.TryGetAvatar(avatarId,out avatar)) | 1209 | if (homeScene.TryGetScenePresence(avatarId,out avatar)) |
1210 | { | 1210 | { |
1211 | KillAUser ku = new KillAUser(avatar,mod); | 1211 | KillAUser ku = new KillAUser(avatar,mod); |
1212 | Watchdog.StartThread(ku.ShutdownNoLogout, "OGPShutdown", ThreadPriority.Normal, true); | 1212 | Watchdog.StartThread(ku.ShutdownNoLogout, "OGPShutdown", ThreadPriority.Normal, true); |