Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-09-27 01:32:06 +01:00
commit 296cf04ce6
1 changed files with 1 additions and 1 deletions

View File

@ -373,7 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
gim.fromAgentName = fromAgentName; gim.fromAgentName = fromAgentName;
gim.fromGroup = fromGroup; gim.fromGroup = fromGroup;
gim.imSessionID = imSessionID.Guid; gim.imSessionID = imSessionID.Guid;
gim.RegionID = RegionID.Guid; gim.RegionID = UUID.Zero.Guid; // RegionID.Guid;
gim.timestamp = timestamp; gim.timestamp = timestamp;
gim.toAgentID = toAgentID.Guid; gim.toAgentID = toAgentID.Guid;
gim.message = message; gim.message = message;