diff options
author | Melanie | 2013-03-28 02:29:07 +0000 |
---|---|---|
committer | Melanie | 2013-03-28 02:29:07 +0000 |
commit | f548a41fb88bd45deda99a19889960f81a1969c4 (patch) | |
tree | f53b612d628f83bbe60040735fd869fa7c8261b6 /OpenSim/Region/CoreModules/Avatar/Lure | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add back a log message when we attempt a megaregion auto-reteleport (diff) | |
download | opensim-SC_OLD-f548a41fb88bd45deda99a19889960f81a1969c4.zip opensim-SC_OLD-f548a41fb88bd45deda99a19889960f81a1969c4.tar.gz opensim-SC_OLD-f548a41fb88bd45deda99a19889960f81a1969c4.tar.bz2 opensim-SC_OLD-f548a41fb88bd45deda99a19889960f81a1969c4.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Lure')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index 6c9fd86..a34f2d2 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |||
@@ -154,7 +154,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
154 | 154 | ||
155 | void OnIncomingInstantMessage(GridInstantMessage im) | 155 | void OnIncomingInstantMessage(GridInstantMessage im) |
156 | { | 156 | { |
157 | if (im.dialog == (byte)InstantMessageDialog.RequestTeleport) | 157 | if (im.dialog == (byte)InstantMessageDialog.RequestTeleport |
158 | || im.dialog == (byte)InstantMessageDialog.GodLikeRequestTeleport) | ||
158 | { | 159 | { |
159 | UUID sessionID = new UUID(im.imSessionID); | 160 | UUID sessionID = new UUID(im.imSessionID); |
160 | 161 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs index f3adb95..0c64f19 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | |||
@@ -165,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
165 | (uint)presence.AbsolutePosition.Y, | 165 | (uint)presence.AbsolutePosition.Y, |
166 | (uint)presence.AbsolutePosition.Z + 2); | 166 | (uint)presence.AbsolutePosition.Z + 2); |
167 | 167 | ||
168 | m_log.DebugFormat("[LURE]: TP invite with message {0}", message); | 168 | m_log.DebugFormat("TP invite with message {0}, type {1}", message, lureType); |
169 | 169 | ||
170 | GridInstantMessage m; | 170 | GridInstantMessage m; |
171 | 171 | ||