aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
diff options
context:
space:
mode:
authorMW2007-08-20 11:52:55 +0000
committerMW2007-08-20 11:52:55 +0000
commit4af33c4da6774363db0d442f81b4871718cc5f2e (patch)
tree76793256cd683b45c81e7a28bbd33ffe70cf72bc /OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
parentSome minor changes + krinkec's updates to ll* functions. (diff)
downloadopensim-SC-4af33c4da6774363db0d442f81b4871718cc5f2e.zip
opensim-SC-4af33c4da6774363db0d442f81b4871718cc5f2e.tar.gz
opensim-SC-4af33c4da6774363db0d442f81b4871718cc5f2e.tar.bz2
opensim-SC-4af33c4da6774363db0d442f81b4871718cc5f2e.tar.xz
Instant Messages between users in the same region should actually now work.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index a35140d..0ed10c0 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Environment.Scenes
122 /// <param name="timestamp"></param> 122 /// <param name="timestamp"></param>
123 /// <param name="fromAgentName"></param> 123 /// <param name="fromAgentName"></param>
124 /// <param name="message"></param> 124 /// <param name="message"></param>
125 public void InstantMessage(LLUUID fromAgentID, LLUUID toAgentID, uint timestamp, string fromAgentName, string message) 125 public void InstantMessage(LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp, string fromAgentName, string message, byte dialog)
126 { 126 {
127 if (this.Avatars.ContainsKey(toAgentID)) 127 if (this.Avatars.ContainsKey(toAgentID))
128 { 128 {
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Environment.Scenes
132 ScenePresence fromAvatar = this.Avatars[fromAgentID]; 132 ScenePresence fromAvatar = this.Avatars[fromAgentID];
133 ScenePresence toAvatar = this.Avatars[toAgentID]; 133 ScenePresence toAvatar = this.Avatars[toAgentID];
134 string fromName = fromAvatar.Firstname + " " + fromAvatar.Lastname; 134 string fromName = fromAvatar.Firstname + " " + fromAvatar.Lastname;
135 toAvatar.ControllingClient.SendInstantMessage(message, toAgentID, fromName); 135 toAvatar.ControllingClient.SendInstantMessage( fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromName, dialog, timestamp);
136 } 136 }
137 else 137 else
138 { 138 {