aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-16 22:04:01 +0000
committerMelanie Thielker2008-11-16 22:04:01 +0000
commit5e2e05a1c1cf083c52728798c809711f4e2f52ae (patch)
treea51ab47c0d6e83a31fc02e0b840911bf936fe802 /OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
parent- Fix a formatting error in a log message (Mantis#2635). (diff)
downloadopensim-SC-5e2e05a1c1cf083c52728798c809711f4e2f52ae.zip
opensim-SC-5e2e05a1c1cf083c52728798c809711f4e2f52ae.tar.gz
opensim-SC-5e2e05a1c1cf083c52728798c809711f4e2f52ae.tar.bz2
opensim-SC-5e2e05a1c1cf083c52728798c809711f4e2f52ae.tar.xz
Megapatch. Completely remove the multiparameter IM methods. Remove the insecure
fromAgentSession field.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
index 0dc29a1..67346ae 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -185,7 +185,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
185 bool successful = false; 185 bool successful = false;
186 // various rational defaults 186 // various rational defaults
187 UUID fromAgentID = UUID.Zero; 187 UUID fromAgentID = UUID.Zero;
188 UUID fromAgentSession = UUID.Zero;
189 UUID toAgentID = UUID.Zero; 188 UUID toAgentID = UUID.Zero;
190 UUID imSessionID = UUID.Zero; 189 UUID imSessionID = UUID.Zero;
191 uint timestamp = 0; 190 uint timestamp = 0;
@@ -207,7 +206,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
207 206
208 Hashtable requestData = (Hashtable)request.Params[0]; 207 Hashtable requestData = (Hashtable)request.Params[0];
209 // Check if it's got all the data 208 // Check if it's got all the data
210 if (requestData.ContainsKey("from_agent_id") && requestData.ContainsKey("from_agent_session") 209 if (requestData.ContainsKey("from_agent_id")
211 && requestData.ContainsKey("to_agent_id") && requestData.ContainsKey("im_session_id") 210 && requestData.ContainsKey("to_agent_id") && requestData.ContainsKey("im_session_id")
212 && requestData.ContainsKey("timestamp") && requestData.ContainsKey("from_agent_name") 211 && requestData.ContainsKey("timestamp") && requestData.ContainsKey("from_agent_name")
213 && requestData.ContainsKey("message") && requestData.ContainsKey("dialog") 212 && requestData.ContainsKey("message") && requestData.ContainsKey("dialog")
@@ -219,7 +218,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
219 { 218 {
220 // Do the easy way of validating the UUIDs 219 // Do the easy way of validating the UUIDs
221 UUID.TryParse((string)requestData["from_agent_id"], out fromAgentID); 220 UUID.TryParse((string)requestData["from_agent_id"], out fromAgentID);
222 UUID.TryParse((string)requestData["from_agent_session"], out fromAgentSession);
223 UUID.TryParse((string)requestData["to_agent_id"], out toAgentID); 221 UUID.TryParse((string)requestData["to_agent_id"], out toAgentID);
224 UUID.TryParse((string)requestData["im_session_id"], out imSessionID); 222 UUID.TryParse((string)requestData["im_session_id"], out imSessionID);
225 UUID.TryParse((string)requestData["region_id"], out RegionID); 223 UUID.TryParse((string)requestData["region_id"], out RegionID);
@@ -337,7 +335,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
337 GridInstantMessage gim = new GridInstantMessage(); 335 GridInstantMessage gim = new GridInstantMessage();
338 gim.fromAgentID = fromAgentID.Guid; 336 gim.fromAgentID = fromAgentID.Guid;
339 gim.fromAgentName = fromAgentName; 337 gim.fromAgentName = fromAgentName;
340 gim.fromAgentSession = fromAgentSession.Guid;
341 gim.fromGroup = fromGroup; 338 gim.fromGroup = fromGroup;
342 gim.imSessionID = imSessionID.Guid; 339 gim.imSessionID = imSessionID.Guid;
343 gim.RegionID = RegionID.Guid; 340 gim.RegionID = RegionID.Guid;
@@ -598,7 +595,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
598 { 595 {
599 Hashtable gim = new Hashtable(); 596 Hashtable gim = new Hashtable();
600 gim["from_agent_id"] = msg.fromAgentID.ToString(); 597 gim["from_agent_id"] = msg.fromAgentID.ToString();
601 gim["from_agent_session"] = msg.fromAgentSession.ToString(); 598 // Kept for compatibility
599 gim["from_agent_session"] = UUID.Zero.ToString();
602 gim["to_agent_id"] = msg.toAgentID.ToString(); 600 gim["to_agent_id"] = msg.toAgentID.ToString();
603 gim["im_session_id"] = msg.imSessionID.ToString(); 601 gim["im_session_id"] = msg.imSessionID.ToString();
604 gim["timestamp"] = msg.timestamp.ToString(); 602 gim["timestamp"] = msg.timestamp.ToString();