diff options
| author | Melanie | 2012-10-07 03:03:24 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-07 03:03:24 +0100 |
| commit | 9be2d5c77da8c2fc6c953e26a8b1412642588eb2 (patch) | |
| tree | 58ab78fef437008c69e0689b5892e8632d31efc0 /OpenSim/Region/CoreModules/Avatar/Gods | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-9be2d5c77da8c2fc6c953e26a8b1412642588eb2.zip opensim-SC_OLD-9be2d5c77da8c2fc6c953e26a8b1412642588eb2.tar.gz opensim-SC_OLD-9be2d5c77da8c2fc6c953e26a8b1412642588eb2.tar.bz2 opensim-SC_OLD-9be2d5c77da8c2fc6c953e26a8b1412642588eb2.tar.xz | |
Fix merge issues
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Gods')
| -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 716cc69..82816d9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||
| @@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
| 206 | transferModule.SendInstantMessage(new GridInstantMessage( | 206 | transferModule.SendInstantMessage(new GridInstantMessage( |
| 207 | m_scene, godID, "God", agentID, (byte)250, false, | 207 | m_scene, godID, "God", agentID, (byte)250, false, |
| 208 | Utils.BytesToString(reason), UUID.Zero, true, | 208 | Utils.BytesToString(reason), UUID.Zero, true, |
| 209 | new Vector3(), new byte[] {(byte)kickflags}), | 209 | new Vector3(), new byte[] {(byte)kickflags}, true), |
| 210 | delegate(bool success) {} ); | 210 | delegate(bool success) {} ); |
| 211 | } | 211 | } |
| 212 | return; | 212 | return; |