aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-01-02 03:05:18 +0000
committerTeravus Ovares2008-01-02 03:05:18 +0000
commit2f435783866656f8e75ba96febe688378ff320b0 (patch)
tree4d1b4351b8cb10132c4cbd7a26d78fa2d2ffe3eb /OpenSim/Region/Environment/Modules/InstantMessageModule.cs
parent* Updates UserServer (diff)
downloadopensim-SC_OLD-2f435783866656f8e75ba96febe688378ff320b0.zip
opensim-SC_OLD-2f435783866656f8e75ba96febe688378ff320b0.tar.gz
opensim-SC_OLD-2f435783866656f8e75ba96febe688378ff320b0.tar.bz2
opensim-SC_OLD-2f435783866656f8e75ba96febe688378ff320b0.tar.xz
* Re-wrote IM that sends the friend request so that it displays the name of the person who sent the request, or (hippos) if it can't find it.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/InstantMessageModule.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/InstantMessageModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
index 0967b70..f5eb052 100644
--- a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules
61 client.OnInstantMessage += OnInstantMessage; 61 client.OnInstantMessage += OnInstantMessage;
62 } 62 }
63 63
64 private void OnInstantMessage(LLUUID fromAgentID, 64 private void OnInstantMessage(IClientAPI client,LLUUID fromAgentID,
65 LLUUID fromAgentSession, LLUUID toAgentID, 65 LLUUID fromAgentSession, LLUUID toAgentID,
66 LLUUID imSessionID, uint timestamp, string fromAgentName, 66 LLUUID imSessionID, uint timestamp, string fromAgentName,
67 string message, byte dialog, bool fromGroup, byte offline, 67 string message, byte dialog, bool fromGroup, byte offline,
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules
105 private void OnGridInstantMessage(GridInstantMessage msg) 105 private void OnGridInstantMessage(GridInstantMessage msg)
106 { 106 {
107 // Trigger the above event handler 107 // Trigger the above event handler
108 OnInstantMessage(new LLUUID(msg.fromAgentID), new LLUUID(msg.fromAgentSession), 108 OnInstantMessage(null,new LLUUID(msg.fromAgentID), new LLUUID(msg.fromAgentSession),
109 new LLUUID(msg.toAgentID), new LLUUID(msg.imSessionID), msg.timestamp, msg.fromAgentName, 109 new LLUUID(msg.toAgentID), new LLUUID(msg.imSessionID), msg.timestamp, msg.fromAgentName,
110 msg.message, msg.dialog, msg.fromGroup, msg.offline, msg.ParentEstateID, 110 msg.message, msg.dialog, msg.fromGroup, msg.offline, msg.ParentEstateID,
111 new LLVector3(msg.Position.x,msg.Position.y,msg.Position.z), new LLUUID(msg.RegionID), 111 new LLVector3(msg.Position.x,msg.Position.y,msg.Position.z), new LLUUID(msg.RegionID),