diff options
author | Melanie | 2013-07-29 02:08:05 +0100 |
---|---|---|
committer | Melanie | 2013-07-29 02:08:05 +0100 |
commit | bf283208df4a6936de85b2746112bb568d9c9d25 (patch) | |
tree | dafe50ad8e55ac30c41f5e7ebd11992f2772c294 /OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Same issue. (diff) | |
download | opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.zip opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.gz opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.bz2 opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 1627f6c..b321adb 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -392,7 +392,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
392 | gim.fromAgentName = fromAgentName; | 392 | gim.fromAgentName = fromAgentName; |
393 | gim.fromGroup = fromGroup; | 393 | gim.fromGroup = fromGroup; |
394 | gim.imSessionID = imSessionID.Guid; | 394 | gim.imSessionID = imSessionID.Guid; |
395 | gim.RegionID = UUID.Zero.Guid; // RegionID.Guid; | 395 | gim.RegionID = RegionID.Guid; |
396 | gim.timestamp = timestamp; | 396 | gim.timestamp = timestamp; |
397 | gim.toAgentID = toAgentID.Guid; | 397 | gim.toAgentID = toAgentID.Guid; |
398 | gim.message = message; | 398 | gim.message = message; |
@@ -728,7 +728,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
728 | gim["position_x"] = msg.Position.X.ToString(); | 728 | gim["position_x"] = msg.Position.X.ToString(); |
729 | gim["position_y"] = msg.Position.Y.ToString(); | 729 | gim["position_y"] = msg.Position.Y.ToString(); |
730 | gim["position_z"] = msg.Position.Z.ToString(); | 730 | gim["position_z"] = msg.Position.Z.ToString(); |
731 | gim["region_id"] = msg.RegionID.ToString(); | 731 | gim["region_id"] = new UUID(msg.RegionID).ToString(); |
732 | gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket,Base64FormattingOptions.None); | 732 | gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket,Base64FormattingOptions.None); |
733 | if (m_MessageKey != String.Empty) | 733 | if (m_MessageKey != String.Empty) |
734 | gim["message_key"] = m_MessageKey; | 734 | gim["message_key"] = m_MessageKey; |