mirror of
https://github.com/opensim/opensim.git
synced 2026-08-11 11:57:03 +08:00
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user