aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2008-11-15 16:25:30 +0000
committerHomer Horwitz2008-11-15 16:25:30 +0000
commit1f06532b826de55c515f0b514f11a345f298ced6 (patch)
treef45d4ced57b8e5c026041c9ce91e49ccddab8084
parentUpdate svn properties, minor formatting cleanup. (diff)
downloadopensim-SC_OLD-1f06532b826de55c515f0b514f11a345f298ced6.zip
opensim-SC_OLD-1f06532b826de55c515f0b514f11a345f298ced6.tar.gz
opensim-SC_OLD-1f06532b826de55c515f0b514f11a345f298ced6.tar.bz2
opensim-SC_OLD-1f06532b826de55c515f0b514f11a345f298ced6.tar.xz
Hack to temporarily fix friends-handling. This will be redone as soon as
Melanie's CommunicationModule is in. Please note: imSession is a transaction-ID, *not* the agent's session.
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index 0698b9a..805f7cb 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
162 { 162 {
163 user.ControllingClient.SendInstantMessage(fromAgentID, message, 163 user.ControllingClient.SendInstantMessage(fromAgentID, message,
164 toAgentID, fromAgentName, dialog, 164 toAgentID, fromAgentName, dialog,
165 timestamp, UUID.Zero, fromGroup, binaryBucket); 165 timestamp, imSessionID, fromGroup, binaryBucket);
166 // Message sent 166 // Message sent
167 return; 167 return;
168 } 168 }
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
179 179
180 user.ControllingClient.SendInstantMessage(fromAgentID, message, 180 user.ControllingClient.SendInstantMessage(fromAgentID, message,
181 toAgentID, fromAgentName, dialog, 181 toAgentID, fromAgentName, dialog,
182 timestamp, UUID.Zero, fromGroup, binaryBucket); 182 timestamp, imSessionID, fromGroup, binaryBucket);
183 // Message sent 183 // Message sent
184 return; 184 return;
185 } 185 }