Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
This commit is contained in:
Melanie
2013-03-28 02:29:07 +00:00
5 changed files with 100 additions and 62 deletions

View File

@@ -165,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
(uint)presence.AbsolutePosition.Y,
(uint)presence.AbsolutePosition.Z + 2);
m_log.DebugFormat("[LURE]: TP invite with message {0}", message);
m_log.DebugFormat("TP invite with message {0}, type {1}", message, lureType);
GridInstantMessage m;