diff options
author | UbitUmarov | 2016-07-24 15:17:25 +0100 |
---|---|---|
committer | UbitUmarov | 2016-07-24 15:17:25 +0100 |
commit | bf604c85c66dd3bed06e3103cdf210ede02c151f (patch) | |
tree | ca4bbbeea4336bc971fc7c2ffbebfbbeb7e3f929 /OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |
parent | do not send IMs via child agents (diff) | |
download | opensim-SC_OLD-bf604c85c66dd3bed06e3103cdf210ede02c151f.zip opensim-SC_OLD-bf604c85c66dd3bed06e3103cdf210ede02c151f.tar.gz opensim-SC_OLD-bf604c85c66dd3bed06e3103cdf210ede02c151f.tar.bz2 opensim-SC_OLD-bf604c85c66dd3bed06e3103cdf210ede02c151f.tar.xz |
add missing IM parameter ( needs fix where it is really relevant )
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 6958905..1366103 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -216,6 +216,7 @@ 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; | ||
219 | uint timestamp = 0; | 220 | uint timestamp = 0; |
220 | string fromAgentName = ""; | 221 | string fromAgentName = ""; |
221 | string message = ""; | 222 | string message = ""; |
@@ -232,7 +233,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
232 | float pos_z = 0; | 233 | float pos_z = 0; |
233 | //m_log.Info("Processing IM"); | 234 | //m_log.Info("Processing IM"); |
234 | 235 | ||
235 | |||
236 | Hashtable requestData = (Hashtable)request.Params[0]; | 236 | Hashtable requestData = (Hashtable)request.Params[0]; |
237 | // Check if it's got all the data | 237 | // Check if it's got all the data |
238 | if (requestData.ContainsKey("from_agent_id") | 238 | if (requestData.ContainsKey("from_agent_id") |
@@ -263,6 +263,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
263 | UUID.TryParse((string)requestData["to_agent_id"], out toAgentID); | 263 | UUID.TryParse((string)requestData["to_agent_id"], out toAgentID); |
264 | UUID.TryParse((string)requestData["im_session_id"], out imSessionID); | 264 | UUID.TryParse((string)requestData["im_session_id"], out imSessionID); |
265 | UUID.TryParse((string)requestData["region_id"], out RegionID); | 265 | UUID.TryParse((string)requestData["region_id"], out RegionID); |
266 | UUID.TryParse((string)requestData["id"], out imID); | ||
266 | 267 | ||
267 | try | 268 | try |
268 | { | 269 | { |
@@ -390,6 +391,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
390 | gim.ParentEstateID = ParentEstateID; | 391 | gim.ParentEstateID = ParentEstateID; |
391 | gim.Position = Position; | 392 | gim.Position = Position; |
392 | gim.binaryBucket = binaryBucket; | 393 | gim.binaryBucket = binaryBucket; |
394 | gim.ID = imID.Guid; | ||
393 | 395 | ||
394 | 396 | ||
395 | // Trigger the Instant message in the scene. | 397 | // Trigger the Instant message in the scene. |
@@ -508,7 +510,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
508 | 510 | ||
509 | UUID toAgentID = new UUID(im.toAgentID); | 511 | UUID toAgentID = new UUID(im.toAgentID); |
510 | PresenceInfo upd = null; | 512 | PresenceInfo upd = null; |
511 | UUID regionID; | ||
512 | bool lookupAgent = false; | 513 | bool lookupAgent = false; |
513 | 514 | ||
514 | lock (m_UserRegionMap) | 515 | lock (m_UserRegionMap) |
@@ -701,6 +702,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
701 | gim["from_agent_session"] = UUID.Zero.ToString(); | 702 | gim["from_agent_session"] = UUID.Zero.ToString(); |
702 | gim["to_agent_id"] = msg.toAgentID.ToString(); | 703 | gim["to_agent_id"] = msg.toAgentID.ToString(); |
703 | gim["im_session_id"] = msg.imSessionID.ToString(); | 704 | gim["im_session_id"] = msg.imSessionID.ToString(); |
705 | if(msg.ID != Guid.Empty) | ||
706 | gim["id"] = msg.ID.ToString(); | ||
704 | gim["timestamp"] = msg.timestamp.ToString(); | 707 | gim["timestamp"] = msg.timestamp.ToString(); |
705 | gim["from_agent_name"] = msg.fromAgentName; | 708 | gim["from_agent_name"] = msg.fromAgentName; |
706 | gim["message"] = msg.message; | 709 | gim["message"] = msg.message; |