diff options
| author | Dan Lake | 2012-10-08 15:25:26 -0700 |
|---|---|---|
| committer | Dan Lake | 2012-10-08 15:25:26 -0700 |
| commit | d342adaa8760ee7ada1b87dec1c8c415c9e77f73 (patch) | |
| tree | a914c203322b761640450c7be06c54984b64494d /OpenSim/Region/CoreModules/Avatar/Lure | |
| parent | Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full ... (diff) | |
| parent | Fix build break (diff) | |
| download | opensim-SC_OLD-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.zip opensim-SC_OLD-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.tar.gz opensim-SC_OLD-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.tar.bz2 opensim-SC_OLD-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Lure')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index 92cf9d1..9c369f6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |||
| @@ -186,7 +186,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
| 186 | client.FirstName+" "+client.LastName, targetid, | 186 | client.FirstName+" "+client.LastName, targetid, |
| 187 | (byte)InstantMessageDialog.RequestTeleport, false, | 187 | (byte)InstantMessageDialog.RequestTeleport, false, |
| 188 | message, sessionID, false, presence.AbsolutePosition, | 188 | message, sessionID, false, presence.AbsolutePosition, |
| 189 | new Byte[0]); | 189 | new Byte[0], true); |
| 190 | m.RegionID = client.Scene.RegionInfo.RegionID.Guid; | 190 | m.RegionID = client.Scene.RegionInfo.RegionID.Guid; |
| 191 | 191 | ||
| 192 | m_log.DebugFormat("[HG LURE MODULE]: RequestTeleport sessionID={0}, regionID={1}, message={2}", m.imSessionID, m.RegionID, m.message); | 192 | m_log.DebugFormat("[HG LURE MODULE]: RequestTeleport sessionID={0}, regionID={1}, message={2}", m.imSessionID, m.RegionID, m.message); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs index 2d4cffd..6ce9556 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | |||
| @@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
| 169 | client.FirstName+" "+client.LastName, targetid, | 169 | client.FirstName+" "+client.LastName, targetid, |
| 170 | (byte)InstantMessageDialog.RequestTeleport, false, | 170 | (byte)InstantMessageDialog.RequestTeleport, false, |
| 171 | message, dest, false, presence.AbsolutePosition, | 171 | message, dest, false, presence.AbsolutePosition, |
| 172 | new Byte[0]); | 172 | new Byte[0], true); |
| 173 | 173 | ||
| 174 | if (m_TransferModule != null) | 174 | if (m_TransferModule != null) |
| 175 | { | 175 | { |