diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index 7e1bed5..50171a3 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||
| @@ -118,7 +118,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
| 118 | 118 | ||
| 119 | m_scene.ForEachClient( | 119 | m_scene.ForEachClient( |
| 120 | delegate(IClientAPI controller) | 120 | delegate(IClientAPI controller) |
| 121 | { | 121 | { |
| 122 | if (controller.AgentId != godID) | 122 | if (controller.AgentId != godID) |
| 123 | controller.Kick(reasonStr); | 123 | controller.Kick(reasonStr); |
| 124 | } | 124 | } |