ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Refactored OutPacket and FirstName/LastName out of Friends Module.

Browse Source
This commit is contained in:
Teravus Ovares
2008-05-14 03:57:30 +00:00
parent 92128d4ef9
commit 9e1cc72c6e
5 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
View File

@@ -164,13 +164,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
if (fli.Friend == client.AgentId)
{
fli.onlinestatus = true;
OnlineNotificationPacket onp = new OnlineNotificationPacket();
OnlineNotificationPacket.AgentBlockBlock[] onpb = new OnlineNotificationPacket.AgentBlockBlock[1];
OnlineNotificationPacket.AgentBlockBlock onpbl = new OnlineNotificationPacket.AgentBlockBlock();
onpbl.AgentID = client.AgentId;
onpb[0] = onpbl;
onp.AgentBlock = onpb;
av.ControllingClient.OutPacket(onp, ThrottleOutPacketType.Task);
LLUUID[] Agents = new LLUUID[1];
Agents[0] = client.AgentId;
av.ControllingClient.SendAgentOnline(Agents);
}
}
}
@@ -179,16 +176,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
if (UpdateUsers.Count > 0)
{
OnlineNotificationPacket onp = new OnlineNotificationPacket();
OnlineNotificationPacket.AgentBlockBlock[] onpb = new OnlineNotificationPacket.AgentBlockBlock[UpdateUsers.Count];
for (int i = 0; i < UpdateUsers.Count; i++)
{
OnlineNotificationPacket.AgentBlockBlock onpbl = new OnlineNotificationPacket.AgentBlockBlock();
onpbl.AgentID = UpdateUsers[i];
onpb[i] = onpbl;
}
onp.AgentBlock = onpb;
client.OutPacket(onp, ThrottleOutPacketType.Task);
client.SendAgentOnline(UpdateUsers.ToArray());
}
}
@@ -278,13 +268,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
ScenePresence av = GetPresenceFromAgentID(updateUsers[i]);
if (av != null)
{
OfflineNotificationPacket onp = new OfflineNotificationPacket();
OfflineNotificationPacket.AgentBlockBlock[] onpb = new OfflineNotificationPacket.AgentBlockBlock[1];
OfflineNotificationPacket.AgentBlockBlock onpbl = new OfflineNotificationPacket.AgentBlockBlock();
onpbl.AgentID = AgentId;
onpb[0] = onpbl;
onp.AgentBlock = onpb;
av.ControllingClient.OutPacket(onp, ThrottleOutPacketType.Task);
LLUUID[] agents = new LLUUID[1];
agents[0] = AgentId;
av.ControllingClient.SendAgentOffline(agents);
}
}
}
@@ -388,7 +374,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
msg.timestamp = timestamp;
if (client != null)
{
msg.fromAgentName = client.FirstName + " " + client.LastName; // fromAgentName;
msg.fromAgentName = client.Name; // fromAgentName;
}
else
{
@@ -439,7 +425,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
GridInstantMessage msg = new GridInstantMessage();
msg.toAgentID = m_pendingFriendRequests[transactionID].UUID;
msg.fromAgentID = agentID.UUID;
msg.fromAgentName = client.FirstName + " " + client.LastName;
msg.fromAgentName = client.Name;
msg.fromAgentSession = client.SessionId.UUID;
msg.fromGroup = false;
msg.imSessionID = transactionID.UUID;
@@ -477,7 +463,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
GridInstantMessage msg = new GridInstantMessage();
msg.toAgentID = m_pendingFriendRequests[transactionID].UUID;
msg.fromAgentID = agentID.UUID;
msg.fromAgentName = client.FirstName + " " + client.LastName;
msg.fromAgentName = client.Name;
msg.fromAgentSession = client.SessionId.UUID;
msg.fromGroup = false;
msg.imSessionID = transactionID.UUID;

10
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@@ -83,6 +83,16 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
Position, m_scene.RegionInfo.RegionID, new byte[0]);
}
public void SendAgentOffline(LLUUID[] agentIDs)
{
}
public void SendAgentOnline(LLUUID[] agentIDs)
{
}
public LLUUID GetDefaultAnimation(string name)
{
return LLUUID.Zero;