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 | |
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')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 4 |
2 files changed, 3 insertions, 3 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; |
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs index a889984..1949459 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | |||
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
173 | client.FirstName+" "+client.LastName, targetid, | 173 | client.FirstName+" "+client.LastName, targetid, |
174 | (byte)InstantMessageDialog.GodLikeRequestTeleport, false, | 174 | (byte)InstantMessageDialog.GodLikeRequestTeleport, false, |
175 | message, dest, false, presence.AbsolutePosition, | 175 | message, dest, false, presence.AbsolutePosition, |
176 | new Byte[0]); | 176 | new Byte[0], true); |
177 | } | 177 | } |
178 | else | 178 | else |
179 | { | 179 | { |
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
181 | client.FirstName+" "+client.LastName, targetid, | 181 | client.FirstName+" "+client.LastName, targetid, |
182 | (byte)InstantMessageDialog.RequestTeleport, false, | 182 | (byte)InstantMessageDialog.RequestTeleport, false, |
183 | message, dest, false, presence.AbsolutePosition, | 183 | message, dest, false, presence.AbsolutePosition, |
184 | new Byte[0]); | 184 | new Byte[0], true); |
185 | } | 185 | } |
186 | 186 | ||
187 | if (m_TransferModule != null) | 187 | if (m_TransferModule != null) |