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/Lure | |
| 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/Lure')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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) |