aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-28 01:37:52 +0000
committerJustin Clark-Casey (justincc)2013-03-28 01:37:52 +0000
commitb5b01e5bb59656078012c12146ea6f9e71589d43 (patch)
tree8651ee2ada29fcf9b18e4d8d8541c91e32142627 /OpenSim
parentAdd "show eq" console command to show numbers of messages in agent event queues. (diff)
downloadopensim-SC_OLD-b5b01e5bb59656078012c12146ea6f9e71589d43.zip
opensim-SC_OLD-b5b01e5bb59656078012c12146ea6f9e71589d43.tar.gz
opensim-SC_OLD-b5b01e5bb59656078012c12146ea6f9e71589d43.tar.bz2
opensim-SC_OLD-b5b01e5bb59656078012c12146ea6f9e71589d43.tar.xz
Make HGLureModule track god like lures as well as normal lures, to see if this fixes issues where second megaregion auto-teleport hangs on black teleport screen when HG is active.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs3
1 files changed, 2 insertions, 1 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