ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

* 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.

Browse Source
This commit is contained in:
Teravus Ovares
2008-01-02 03:05:18 +00:00
parent 3738bc8899
commit 2f43578386
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Environment/Modules/FriendsModule.cs
View File

@@ -72,7 +72,7 @@ namespace OpenSim.Region.Environment.Modules
}
private void OnInstantMessage(LLUUID fromAgentID,
private void OnInstantMessage(IClientAPI client,LLUUID fromAgentID,
LLUUID fromAgentSession, LLUUID toAgentID,
LLUUID imSessionID, uint timestamp, string fromAgentName,
string message, byte dialog, bool fromGroup, byte offline,
@@ -97,7 +97,14 @@ namespace OpenSim.Region.Environment.Modules
msg.imSessionID = friendTransactionID.UUID; // This is the item we're mucking with here
m_log.Verbose("FRIEND","Filling Session: " + msg.imSessionID.ToString());
msg.timestamp = timestamp;
msg.fromAgentName = fromAgentName;
if (client != null)
{
msg.fromAgentName = client.FirstName + " " + client.LastName;// fromAgentName;
}
else
{
msg.fromAgentName = "(hippos)";// Added for posterity. This means that we can't figure out who sent it
}
msg.message = message;
msg.dialog = dialog;
msg.fromGroup = fromGroup;
@@ -194,7 +201,7 @@ namespace OpenSim.Region.Environment.Modules
private void OnGridInstantMessage(GridInstantMessage msg)
{
// Trigger the above event handler
OnInstantMessage(new LLUUID(msg.fromAgentID), new LLUUID(msg.fromAgentSession),
OnInstantMessage(null,new LLUUID(msg.fromAgentID), new LLUUID(msg.fromAgentSession),
new LLUUID(msg.toAgentID), new LLUUID(msg.imSessionID), msg.timestamp, msg.fromAgentName,
msg.message, msg.dialog, msg.fromGroup, msg.offline, msg.ParentEstateID,
new LLVector3(msg.Position.x, msg.Position.y, msg.Position.z), new LLUUID(msg.RegionID),