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

Committing a small fix for EventData along with more plumbing work

Browse Source
This commit is contained in:
Melanie Thielker
2008-10-26 19:32:41 +00:00
parent ba79c26d2d
commit f7e44250bf
8 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
View File

@@ -118,13 +118,17 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
|| dialog == (byte) InstantMessageDialog.InventoryOffered
|| dialog == (byte) InstantMessageDialog.InventoryAccepted
|| dialog == (byte) InstantMessageDialog.InventoryDeclined
|| dialog == (byte) InstantMessageDialog.GroupNoticeInventoryAccepted
|| dialog == (byte) InstantMessageDialog.GroupNoticeInventoryDeclined
|| dialog == (byte) InstantMessageDialog.GroupInvitationAccept
|| dialog == (byte) InstantMessageDialog.GroupInvitationDecline
|| dialog == (byte) InstantMessageDialog.GroupNotice);
// IM dialogs need to be pre-processed and have their sessionID filled by the server
// so the sim can match the transaction on the return packet.
// Don't send a Friend Dialog IM with a UUID.Zero session.
if (!(dialogHandledElsewhere && imSessionID == UUID.Zero))
if (!dialogHandledElsewhere)
{
// Try root avatar only first
foreach (Scene scene in m_scenes)
@@ -137,7 +141,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
{
user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message,
toAgentID, imSessionID, fromAgentName, dialog,
timestamp);
timestamp, fromGroup, binaryBucket);
// Message sent
return;
}
@@ -154,7 +158,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message,
toAgentID, imSessionID, fromAgentName, dialog,
timestamp);
timestamp, fromGroup, binaryBucket);
// Message sent
return;
}

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

@@ -547,7 +547,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
{
}
public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, UUID avatarID,
public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID,
uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation)
{
}