diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
-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; |