diff options
| author | BlueWall | 2012-10-09 06:44:14 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-09 06:44:14 -0400 |
| commit | 252af020b05f386f88174cdd28191e0efbeba626 (patch) | |
| tree | f425499b4338fa3a15f51b7621f4d37dec1d5ce7 /OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | |
| parent | Added parts to manage repositories and plugin management (diff) | |
| parent | Fix build break (diff) | |
| download | opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.zip opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.gz opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.bz2 opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/ServerMain.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | { |