diff options
author | UbitUmarov | 2016-07-28 08:22:51 +0100 |
---|---|---|
committer | UbitUmarov | 2016-07-28 08:22:51 +0100 |
commit | 16a7232f55f4166cad6c4a198a22b5e171977754 (patch) | |
tree | 93b169df03cadb6f3cbaeea48482d67433bfef0d /OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |
parent | remove more code related to Mega regions (diff) | |
download | opensim-SC_OLD-16a7232f55f4166cad6c4a198a22b5e171977754.zip opensim-SC_OLD-16a7232f55f4166cad6c4a198a22b5e171977754.tar.gz opensim-SC_OLD-16a7232f55f4166cad6c4a198a22b5e171977754.tar.bz2 opensim-SC_OLD-16a7232f55f4166cad6c4a198a22b5e171977754.tar.xz |
revert adding a new IM parameter ( commit bf604c85c66dd3bed06e3103cdf210ede02c151f
, that was a mistake. this should fix invites accepts etc, that got broken
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 1366103..6b120fb 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -216,7 +216,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
216 | UUID fromAgentID = UUID.Zero; | 216 | UUID fromAgentID = UUID.Zero; |
217 | UUID toAgentID = UUID.Zero; | 217 | UUID toAgentID = UUID.Zero; |
218 | UUID imSessionID = UUID.Zero; | 218 | UUID imSessionID = UUID.Zero; |
219 | UUID imID = UUID.Zero; | ||
220 | uint timestamp = 0; | 219 | uint timestamp = 0; |
221 | string fromAgentName = ""; | 220 | string fromAgentName = ""; |
222 | string message = ""; | 221 | string message = ""; |
@@ -263,7 +262,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
263 | UUID.TryParse((string)requestData["to_agent_id"], out toAgentID); | 262 | UUID.TryParse((string)requestData["to_agent_id"], out toAgentID); |
264 | UUID.TryParse((string)requestData["im_session_id"], out imSessionID); | 263 | UUID.TryParse((string)requestData["im_session_id"], out imSessionID); |
265 | UUID.TryParse((string)requestData["region_id"], out RegionID); | 264 | UUID.TryParse((string)requestData["region_id"], out RegionID); |
266 | UUID.TryParse((string)requestData["id"], out imID); | ||
267 | 265 | ||
268 | try | 266 | try |
269 | { | 267 | { |
@@ -391,8 +389,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
391 | gim.ParentEstateID = ParentEstateID; | 389 | gim.ParentEstateID = ParentEstateID; |
392 | gim.Position = Position; | 390 | gim.Position = Position; |
393 | gim.binaryBucket = binaryBucket; | 391 | gim.binaryBucket = binaryBucket; |
394 | gim.ID = imID.Guid; | ||
395 | |||
396 | 392 | ||
397 | // Trigger the Instant message in the scene. | 393 | // Trigger the Instant message in the scene. |
398 | foreach (Scene scene in m_Scenes) | 394 | foreach (Scene scene in m_Scenes) |
@@ -702,8 +698,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
702 | gim["from_agent_session"] = UUID.Zero.ToString(); | 698 | gim["from_agent_session"] = UUID.Zero.ToString(); |
703 | gim["to_agent_id"] = msg.toAgentID.ToString(); | 699 | gim["to_agent_id"] = msg.toAgentID.ToString(); |
704 | gim["im_session_id"] = msg.imSessionID.ToString(); | 700 | gim["im_session_id"] = msg.imSessionID.ToString(); |
705 | if(msg.ID != Guid.Empty) | ||
706 | gim["id"] = msg.ID.ToString(); | ||
707 | gim["timestamp"] = msg.timestamp.ToString(); | 701 | gim["timestamp"] = msg.timestamp.ToString(); |
708 | gim["from_agent_name"] = msg.fromAgentName; | 702 | gim["from_agent_name"] = msg.fromAgentName; |
709 | gim["message"] = msg.message; | 703 | gim["message"] = msg.message; |