Merge branch 'master' into careminster
Melanie
commit
b321c0a932
|
|
@ -756,6 +756,25 @@ namespace OpenSim.Client.MXP.ClientStack
|
|||
public event AvatarNotesUpdate OnAvatarNotesUpdate;
|
||||
public event MuteListRequest OnMuteListRequest;
|
||||
public event AvatarInterestUpdate OnAvatarInterestUpdate;
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
public event PlacesQuery OnPlacesQuery;
|
||||
|
||||
|
|
@ -1659,5 +1678,17 @@ namespace OpenSim.Client.MXP.ClientStack
|
|||
public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -374,6 +374,25 @@ namespace OpenSim.Client.Sirikata.ClientStack
|
|||
public event GrantUserFriendRights OnGrantUserRights;
|
||||
public event MuteListRequest OnMuteListRequest;
|
||||
public event PlacesQuery OnPlacesQuery;
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
public void SetDebugPacketLevel(int newDebug)
|
||||
{
|
||||
throw new System.NotImplementedException();
|
||||
|
|
@ -1121,6 +1140,18 @@ namespace OpenSim.Client.Sirikata.ClientStack
|
|||
{
|
||||
throw new System.NotImplementedException();
|
||||
}
|
||||
|
||||
public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
|
||||
{
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -405,6 +405,25 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
|
|||
public event MuteListRequest OnMuteListRequest = delegate { };
|
||||
public event AvatarInterestUpdate OnAvatarInterestUpdate = delegate { };
|
||||
public event PlacesQuery OnPlacesQuery = delegate { };
|
||||
public event FindAgentUpdate OnFindAgentEvent = delegate { };
|
||||
public event TrackAgentUpdate OnTrackAgentEvent = delegate { };
|
||||
public event NewUserReport OnUserReportEvent = delegate { };
|
||||
public event SaveStateHandler OnSaveStateEvent = delegate { };
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest = delegate { };
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest = delegate { };
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest = delegate { };
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent = delegate { };
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent = delegate { };
|
||||
public event ParcelBuyPass OnParcelBuyPass = delegate { };
|
||||
public event ParcelGodMark OnParcelGodMark = delegate { };
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest = delegate { };
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest = delegate { };
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes = delegate { };
|
||||
public event SendPostcard OnSendPostcard = delegate { };
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent = delegate { };
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent = delegate { };
|
||||
public event GodlikeMessage onGodlikeMessageEvent = delegate { };
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent = delegate { };
|
||||
|
||||
|
||||
|
||||
|
|
@ -1165,5 +1184,17 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
|
|||
public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -452,6 +452,47 @@ namespace OpenSim.Framework
|
|||
public delegate void AgentFOV(IClientAPI client, float verticalAngle);
|
||||
|
||||
public delegate double UpdatePriorityHandler(UpdatePriorityData data);
|
||||
|
||||
public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int Flags,UUID AgentID);
|
||||
|
||||
public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name, UUID AgentID);
|
||||
|
||||
public delegate void AvatarInterestReply(IClientAPI client,UUID target, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
|
||||
|
||||
public delegate void FindAgentUpdate(IClientAPI client, UUID hunter, UUID target);
|
||||
|
||||
public delegate void TrackAgentUpdate(IClientAPI client, UUID hunter, UUID target);
|
||||
|
||||
public delegate void FreezeUserUpdate(IClientAPI client, UUID parcelowner,uint flags, UUID target);
|
||||
|
||||
public delegate void EjectUserUpdate(IClientAPI client, UUID parcelowner,uint flags, UUID target);
|
||||
|
||||
public delegate void NewUserReport(IClientAPI client, string regionName,UUID abuserID, byte catagory, byte checkflags, string details, UUID objectID, Vector3 postion, byte reportType ,UUID screenshotID, string summery, UUID reporter);
|
||||
|
||||
public delegate void GodUpdateRegionInfoUpdate(IClientAPI client, float BillableFactor, ulong EstateID, ulong RegionFlags, byte[] SimName,int RedirectX, int RedirectY);
|
||||
|
||||
public delegate void GodlikeMessage(IClientAPI client, UUID requester, byte[] Method, byte[] Parameter);
|
||||
|
||||
public delegate void SaveStateHandler(IClientAPI client,UUID agentID);
|
||||
|
||||
public delegate void GroupAccountSummaryRequest(IClientAPI client,UUID agentID, UUID groupID);
|
||||
|
||||
public delegate void GroupAccountDetailsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
|
||||
|
||||
public delegate void GroupAccountTransactionsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
|
||||
|
||||
public delegate void ParcelBuyPass(IClientAPI client, UUID agentID, int ParcelLocalID);
|
||||
|
||||
public delegate void ParcelGodMark(IClientAPI client, UUID agentID, int ParcelLocalID);
|
||||
|
||||
public delegate void GroupActiveProposalsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
|
||||
|
||||
public delegate void GroupVoteHistoryRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
|
||||
|
||||
|
||||
public delegate void SimWideDeletesDelegate(IClientAPI client,UUID agentID, int flags, UUID targetID);
|
||||
|
||||
public delegate void SendPostcard(IClientAPI client);
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
@ -1028,6 +1069,26 @@ namespace OpenSim.Framework
|
|||
|
||||
event PlacesQuery OnPlacesQuery;
|
||||
|
||||
event FindAgentUpdate OnFindAgentEvent;
|
||||
event TrackAgentUpdate OnTrackAgentEvent;
|
||||
event NewUserReport OnUserReportEvent;
|
||||
event SaveStateHandler OnSaveStateEvent;
|
||||
event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
event ParcelBuyPass OnParcelBuyPass;
|
||||
event ParcelGodMark OnParcelGodMark;
|
||||
event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
event SendPostcard OnSendPostcard;
|
||||
event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
event GodlikeMessage onGodlikeMessageEvent;
|
||||
event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
/// <summary>
|
||||
/// Set the debug level at which packet output should be printed to console.
|
||||
/// </summary>
|
||||
|
|
@ -1394,5 +1455,12 @@ namespace OpenSim.Framework
|
|||
void SendRebakeAvatarTextures(UUID textureID);
|
||||
|
||||
void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages);
|
||||
|
||||
void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt);
|
||||
|
||||
void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier);
|
||||
|
||||
void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt);
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -298,6 +298,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
public event AvatarInterestUpdate OnAvatarInterestUpdate;
|
||||
public event PlacesQuery OnPlacesQuery;
|
||||
public event AgentFOV OnAgentFOV;
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
|
||||
#endregion Events
|
||||
|
||||
|
|
@ -805,6 +825,189 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
OutPacket(gmp, ThrottleOutPacketType.Task);
|
||||
}
|
||||
|
||||
public void SendGroupActiveProposals(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, Dictionary<int, string> VoteID, Dictionary<int, string> VoteInitiator, Dictionary<int, string> Majority, Dictionary<int, string> Quorum, Dictionary<int, string> TerseDateID, Dictionary<int, string> StartDateTime, Dictionary<int, string> EndDateTime, Dictionary<int, string> ProposalText)
|
||||
{
|
||||
foreach(KeyValuePair<int, string> Blank in VoteID)
|
||||
{
|
||||
GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket();
|
||||
|
||||
GAPIRP.AgentData.AgentID = agentID;
|
||||
GAPIRP.AgentData.GroupID = groupID;
|
||||
GAPIRP.TransactionData.TransactionID = transactionID;
|
||||
GAPIRP.TransactionData.TotalNumItems = 1;
|
||||
GroupActiveProposalItemReplyPacket.ProposalDataBlock ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock();
|
||||
GAPIRP.ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock[1];
|
||||
ProposalData.VoteCast = Utils.StringToBytes("false");
|
||||
ProposalData.VoteID = new UUID(VoteID[Blank.Key]);
|
||||
ProposalData.VoteInitiator = new UUID(VoteInitiator[Blank.Key]);
|
||||
ProposalData.Majority = (float)Convert.ToInt32(Majority[Blank.Key]);
|
||||
ProposalData.Quorum = Convert.ToInt32(Quorum[Blank.Key]);
|
||||
ProposalData.TerseDateID = Utils.StringToBytes(TerseDateID[Blank.Key]);
|
||||
ProposalData.StartDateTime = Utils.StringToBytes(StartDateTime[Blank.Key]);
|
||||
ProposalData.EndDateTime = Utils.StringToBytes(EndDateTime[Blank.Key]);
|
||||
ProposalData.ProposalText = Utils.StringToBytes(ProposalText[Blank.Key]);
|
||||
ProposalData.AlreadyVoted = false;
|
||||
GAPIRP.ProposalData[0] = ProposalData;
|
||||
OutPacket(GAPIRP, ThrottleOutPacketType.Task);
|
||||
}
|
||||
if(VoteID.Count == 0)
|
||||
{
|
||||
GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket();
|
||||
|
||||
GAPIRP.AgentData.AgentID = agentID;
|
||||
GAPIRP.AgentData.GroupID = groupID;
|
||||
GAPIRP.TransactionData.TransactionID = transactionID;
|
||||
GAPIRP.TransactionData.TotalNumItems = 1;
|
||||
GroupActiveProposalItemReplyPacket.ProposalDataBlock ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock();
|
||||
GAPIRP.ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock[1];
|
||||
ProposalData.VoteCast = Utils.StringToBytes("false");
|
||||
ProposalData.VoteID = UUID.Zero;
|
||||
ProposalData.VoteInitiator = UUID.Zero;
|
||||
ProposalData.Majority = 0;
|
||||
ProposalData.Quorum = 0;
|
||||
ProposalData.TerseDateID = Utils.StringToBytes("");
|
||||
ProposalData.StartDateTime = Utils.StringToBytes("");
|
||||
ProposalData.EndDateTime = Utils.StringToBytes("");
|
||||
ProposalData.ProposalText = Utils.StringToBytes("");
|
||||
ProposalData.AlreadyVoted = false;
|
||||
GAPIRP.ProposalData[0] = ProposalData;
|
||||
OutPacket(GAPIRP, ThrottleOutPacketType.Task);
|
||||
}
|
||||
}
|
||||
|
||||
public void SendGroupVoteHistory(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, Dictionary<int, string> VoteID, Dictionary<int, string> VoteInitiator, Dictionary<int, string> Majority, Dictionary<int, string> Quorum, Dictionary<int, string> TerseDateID, Dictionary<int, string> StartDateTime, Dictionary<int, string> EndDateTime, Dictionary<int, string> VoteType, Dictionary<int, string> VoteResult, Dictionary<int, string> ProposalText)
|
||||
{
|
||||
foreach(KeyValuePair<int, string> Blank in VoteID)
|
||||
{
|
||||
GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
|
||||
|
||||
GVHIRP.AgentData.AgentID = agentID;
|
||||
GVHIRP.AgentData.GroupID = groupID;
|
||||
GVHIRP.TransactionData.TransactionID = transactionID;
|
||||
GVHIRP.TransactionData.TotalNumItems = 1;
|
||||
GVHIRP.HistoryItemData.VoteID = new UUID(VoteID[Blank.Key]);
|
||||
GVHIRP.HistoryItemData.VoteInitiator = new UUID(VoteInitiator[Blank.Key]);
|
||||
GVHIRP.HistoryItemData.Majority = (float)Convert.ToInt32(Majority[Blank.Key]);
|
||||
GVHIRP.HistoryItemData.Quorum = Convert.ToInt32(Quorum[Blank.Key]);
|
||||
GVHIRP.HistoryItemData.TerseDateID = Utils.StringToBytes(TerseDateID[Blank.Key]);
|
||||
GVHIRP.HistoryItemData.StartDateTime = Utils.StringToBytes(StartDateTime[Blank.Key]);
|
||||
GVHIRP.HistoryItemData.EndDateTime = Utils.StringToBytes(EndDateTime[Blank.Key]);
|
||||
GVHIRP.HistoryItemData.VoteType = Utils.StringToBytes(VoteType[Blank.Key]);
|
||||
GVHIRP.HistoryItemData.VoteResult = Utils.StringToBytes(VoteResult[Blank.Key]);
|
||||
GVHIRP.HistoryItemData.ProposalText = Utils.StringToBytes(ProposalText[Blank.Key]);
|
||||
GroupVoteHistoryItemReplyPacket.VoteItemBlock VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock();
|
||||
GVHIRP.VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock[1];
|
||||
VoteItem.CandidateID = UUID.Zero;
|
||||
VoteItem.NumVotes = 0; //TODO: FIX THIS!!!
|
||||
VoteItem.VoteCast = Utils.StringToBytes("Yes");
|
||||
GVHIRP.VoteItem[0] = VoteItem;
|
||||
OutPacket(GVHIRP, ThrottleOutPacketType.Task);
|
||||
}
|
||||
if(VoteID.Count == 0)
|
||||
{
|
||||
GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
|
||||
|
||||
GVHIRP.AgentData.AgentID = agentID;
|
||||
GVHIRP.AgentData.GroupID = groupID;
|
||||
GVHIRP.TransactionData.TransactionID = transactionID;
|
||||
GVHIRP.TransactionData.TotalNumItems = 0;
|
||||
GVHIRP.HistoryItemData.VoteID = UUID.Zero;
|
||||
GVHIRP.HistoryItemData.VoteInitiator = UUID.Zero;
|
||||
GVHIRP.HistoryItemData.Majority = 0;
|
||||
GVHIRP.HistoryItemData.Quorum = 0;
|
||||
GVHIRP.HistoryItemData.TerseDateID = Utils.StringToBytes("");
|
||||
GVHIRP.HistoryItemData.StartDateTime = Utils.StringToBytes("");
|
||||
GVHIRP.HistoryItemData.EndDateTime = Utils.StringToBytes("");
|
||||
GVHIRP.HistoryItemData.VoteType = Utils.StringToBytes("");
|
||||
GVHIRP.HistoryItemData.VoteResult = Utils.StringToBytes("");
|
||||
GVHIRP.HistoryItemData.ProposalText = Utils.StringToBytes("");
|
||||
GroupVoteHistoryItemReplyPacket.VoteItemBlock VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock();
|
||||
GVHIRP.VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock[1];
|
||||
VoteItem.CandidateID = UUID.Zero;
|
||||
VoteItem.NumVotes = 0; //TODO: FIX THIS!!!
|
||||
VoteItem.VoteCast = Utils.StringToBytes("No");
|
||||
GVHIRP.VoteItem[0] = VoteItem;
|
||||
OutPacket(GVHIRP, ThrottleOutPacketType.Task);
|
||||
}
|
||||
}
|
||||
|
||||
public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
|
||||
{
|
||||
GroupAccountDetailsReplyPacket GADRP = new GroupAccountDetailsReplyPacket();
|
||||
GADRP.AgentData = new GroupAccountDetailsReplyPacket.AgentDataBlock();
|
||||
GADRP.AgentData.AgentID = sender.AgentId;
|
||||
GADRP.AgentData.GroupID = groupID;
|
||||
GADRP.HistoryData = new GroupAccountDetailsReplyPacket.HistoryDataBlock[1];
|
||||
GroupAccountDetailsReplyPacket.HistoryDataBlock History = new GroupAccountDetailsReplyPacket.HistoryDataBlock();
|
||||
GADRP.MoneyData = new GroupAccountDetailsReplyPacket.MoneyDataBlock();
|
||||
GADRP.MoneyData.CurrentInterval = 0;
|
||||
GADRP.MoneyData.IntervalDays = 7;
|
||||
GADRP.MoneyData.RequestID = transactionID;
|
||||
GADRP.MoneyData.StartDate = Utils.StringToBytes(DateTime.Today.ToString());
|
||||
History.Amount = amt;
|
||||
History.Description = Utils.StringToBytes("");
|
||||
GADRP.HistoryData[0] = History;
|
||||
OutPacket(GADRP, ThrottleOutPacketType.Task);
|
||||
}
|
||||
|
||||
public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
|
||||
{
|
||||
GroupAccountSummaryReplyPacket GASRP =
|
||||
(GroupAccountSummaryReplyPacket)PacketPool.Instance.GetPacket(
|
||||
PacketType.GroupAccountSummaryReply);
|
||||
|
||||
GASRP.AgentData = new GroupAccountSummaryReplyPacket.AgentDataBlock();
|
||||
GASRP.AgentData.AgentID = sender.AgentId;
|
||||
GASRP.AgentData.GroupID = groupID;
|
||||
GASRP.MoneyData = new GroupAccountSummaryReplyPacket.MoneyDataBlock();
|
||||
GASRP.MoneyData.Balance = (int)moneyAmt;
|
||||
GASRP.MoneyData.TotalCredits = totalTier;
|
||||
GASRP.MoneyData.TotalDebits = usedTier;
|
||||
GASRP.MoneyData.StartDate = new byte[1];
|
||||
GASRP.MoneyData.CurrentInterval = 1;
|
||||
GASRP.MoneyData.GroupTaxCurrent = 0;
|
||||
GASRP.MoneyData.GroupTaxEstimate = 0;
|
||||
GASRP.MoneyData.IntervalDays = 0;
|
||||
GASRP.MoneyData.LandTaxCurrent = 0;
|
||||
GASRP.MoneyData.LandTaxEstimate = 0;
|
||||
GASRP.MoneyData.LastTaxDate = new byte[1];
|
||||
GASRP.MoneyData.LightTaxCurrent = 0;
|
||||
GASRP.MoneyData.TaxDate = new byte[1];
|
||||
GASRP.MoneyData.RequestID = sender.AgentId;
|
||||
GASRP.MoneyData.ParcelDirFeeEstimate = 0;
|
||||
GASRP.MoneyData.ParcelDirFeeCurrent = 0;
|
||||
GASRP.MoneyData.ObjectTaxEstimate = 0;
|
||||
GASRP.MoneyData.NonExemptMembers = 0;
|
||||
GASRP.MoneyData.ObjectTaxCurrent = 0;
|
||||
GASRP.MoneyData.LightTaxEstimate = 0;
|
||||
OutPacket(GASRP, ThrottleOutPacketType.Task);
|
||||
}
|
||||
|
||||
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
|
||||
{
|
||||
GroupAccountTransactionsReplyPacket GATRP =
|
||||
(GroupAccountTransactionsReplyPacket)PacketPool.Instance.GetPacket(
|
||||
PacketType.GroupAccountTransactionsReply);
|
||||
|
||||
GATRP.AgentData = new GroupAccountTransactionsReplyPacket.AgentDataBlock();
|
||||
GATRP.AgentData.AgentID = sender.AgentId;
|
||||
GATRP.AgentData.GroupID = groupID;
|
||||
GATRP.MoneyData = new GroupAccountTransactionsReplyPacket.MoneyDataBlock();
|
||||
GATRP.MoneyData.CurrentInterval = 0;
|
||||
GATRP.MoneyData.IntervalDays = 7;
|
||||
GATRP.MoneyData.RequestID = transactionID;
|
||||
GATRP.MoneyData.StartDate = Utils.StringToBytes(DateTime.Today.ToString());
|
||||
GATRP.HistoryData = new GroupAccountTransactionsReplyPacket.HistoryDataBlock[1];
|
||||
GroupAccountTransactionsReplyPacket.HistoryDataBlock History = new GroupAccountTransactionsReplyPacket.HistoryDataBlock();
|
||||
History.Amount = 0;
|
||||
History.Item = Utils.StringToBytes("");
|
||||
History.Time = Utils.StringToBytes("");
|
||||
History.Type = 0;
|
||||
History.User = Utils.StringToBytes("");
|
||||
GATRP.HistoryData[0] = History;
|
||||
OutPacket(GATRP, ThrottleOutPacketType.Task);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Send the region heightmap to the client
|
||||
|
|
@ -4537,6 +4740,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
AddLocalPacketHandler(PacketType.AvatarInterestsUpdate, HandleAvatarInterestsUpdate);
|
||||
AddLocalPacketHandler(PacketType.GrantUserRights, HandleGrantUserRights);
|
||||
AddLocalPacketHandler(PacketType.PlacesQuery, HandlePlacesQuery);
|
||||
AddLocalPacketHandler(PacketType.UpdateMuteListEntry, HandleUpdateMuteListEntry);
|
||||
AddLocalPacketHandler(PacketType.RemoveMuteListEntry, HandleRemoveMuteListEntry);
|
||||
AddLocalPacketHandler(PacketType.UserReport, HandleUserReport);
|
||||
AddLocalPacketHandler(PacketType.FindAgent, HandleFindAgent);
|
||||
AddLocalPacketHandler(PacketType.TrackAgent, HandleTrackAgent);
|
||||
AddLocalPacketHandler(PacketType.GodUpdateRegionInfo, HandleGodUpdateRegionInfoUpdate);
|
||||
AddLocalPacketHandler(PacketType.GodlikeMessage, HandleGodlikeMessage);
|
||||
AddLocalPacketHandler(PacketType.StateSave, HandleSaveStatePacket);
|
||||
AddLocalPacketHandler(PacketType.GroupAccountDetailsRequest, HandleGroupAccountDetailsRequest);
|
||||
AddLocalPacketHandler(PacketType.GroupAccountSummaryRequest, HandleGroupAccountSummaryRequest);
|
||||
AddLocalPacketHandler(PacketType.GroupAccountTransactionsRequest, HandleGroupTransactionsDetailsRequest);
|
||||
AddLocalPacketHandler(PacketType.FreezeUser, HandleFreezeUser);
|
||||
AddLocalPacketHandler(PacketType.EjectUser, HandleEjectUser);
|
||||
AddLocalPacketHandler(PacketType.ParcelBuyPass, HandleParcelBuyPass);
|
||||
AddLocalPacketHandler(PacketType.ParcelGodMarkAsContent, HandleParcelGodMarkAsContent);
|
||||
AddLocalPacketHandler(PacketType.GroupActiveProposalsRequest, HandleGroupActiveProposalsRequest);
|
||||
AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest);
|
||||
AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes);
|
||||
AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard);
|
||||
}
|
||||
|
||||
#region Packet Handlers
|
||||
|
|
@ -4632,7 +4854,72 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
private bool HandleParcelGodMarkAsContent(IClientAPI client, Packet Packet)
|
||||
{
|
||||
ParcelGodMarkAsContentPacket ParcelGodMarkAsContent =
|
||||
(ParcelGodMarkAsContentPacket)Packet;
|
||||
|
||||
ParcelGodMark ParcelGodMarkAsContentHandler = OnParcelGodMark;
|
||||
if (ParcelGodMarkAsContentHandler != null)
|
||||
{
|
||||
ParcelGodMarkAsContentHandler(this,
|
||||
ParcelGodMarkAsContent.AgentData.AgentID,
|
||||
ParcelGodMarkAsContent.ParcelData.LocalID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleFreezeUser(IClientAPI client, Packet Packet)
|
||||
{
|
||||
FreezeUserPacket FreezeUser = (FreezeUserPacket)Packet;
|
||||
|
||||
FreezeUserUpdate FreezeUserHandler = OnParcelFreezeUserEvent;
|
||||
if (FreezeUserHandler != null)
|
||||
{
|
||||
FreezeUserHandler(this,
|
||||
FreezeUser.AgentData.AgentID,
|
||||
FreezeUser.Data.Flags,
|
||||
FreezeUser.Data.TargetID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleEjectUser(IClientAPI client, Packet Packet)
|
||||
{
|
||||
EjectUserPacket EjectUser =
|
||||
(EjectUserPacket)Packet;
|
||||
|
||||
EjectUserUpdate EjectUserHandler = OnParcelEjectUserEvent;
|
||||
if (EjectUserHandler != null)
|
||||
{
|
||||
EjectUserHandler(this,
|
||||
EjectUser.AgentData.AgentID,
|
||||
EjectUser.Data.Flags,
|
||||
EjectUser.Data.TargetID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleParcelBuyPass(IClientAPI client, Packet Packet)
|
||||
{
|
||||
ParcelBuyPassPacket ParcelBuyPass =
|
||||
(ParcelBuyPassPacket)Packet;
|
||||
|
||||
ParcelBuyPass ParcelBuyPassHandler = OnParcelBuyPass;
|
||||
if (ParcelBuyPassHandler != null)
|
||||
{
|
||||
ParcelBuyPassHandler(this,
|
||||
ParcelBuyPass.AgentData.AgentID,
|
||||
ParcelBuyPass.ParcelData.LocalID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleParcelBuyRequest(IClientAPI sender, Packet Pack)
|
||||
{
|
||||
ParcelBuyPacket parcel = (ParcelBuyPacket)Pack;
|
||||
|
|
@ -4998,7 +5285,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
private bool HandleFindAgent(IClientAPI client, Packet Packet)
|
||||
{
|
||||
FindAgentPacket FindAgent =
|
||||
(FindAgentPacket)Packet;
|
||||
|
||||
FindAgentUpdate FindAgentHandler = OnFindAgentEvent;
|
||||
if (FindAgentHandler != null)
|
||||
{
|
||||
FindAgentHandler(this,FindAgent.AgentBlock.Hunter,FindAgent.AgentBlock.Prey);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleTrackAgent(IClientAPI client, Packet Packet)
|
||||
{
|
||||
TrackAgentPacket TrackAgent =
|
||||
(TrackAgentPacket)Packet;
|
||||
|
||||
TrackAgentUpdate TrackAgentHandler = OnTrackAgentEvent;
|
||||
if (TrackAgentHandler != null)
|
||||
{
|
||||
TrackAgentHandler(this,
|
||||
TrackAgent.AgentData.AgentID,
|
||||
TrackAgent.TargetData.PreyID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandlerRezObject(IClientAPI sender, Packet Pack)
|
||||
{
|
||||
RezObjectPacket rezPacket = (RezObjectPacket)Pack;
|
||||
|
|
@ -8268,6 +8585,70 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool HandleGodUpdateRegionInfoUpdate(IClientAPI client, Packet Packet)
|
||||
{
|
||||
GodUpdateRegionInfoPacket GodUpdateRegionInfo =
|
||||
(GodUpdateRegionInfoPacket)Packet;
|
||||
|
||||
GodUpdateRegionInfoUpdate handlerGodUpdateRegionInfo = OnGodUpdateRegionInfoUpdateEvent;
|
||||
if (handlerGodUpdateRegionInfo != null)
|
||||
{
|
||||
handlerGodUpdateRegionInfo(this,
|
||||
GodUpdateRegionInfo.RegionInfo.BillableFactor,
|
||||
GodUpdateRegionInfo.RegionInfo.EstateID,
|
||||
GodUpdateRegionInfo.RegionInfo.RegionFlags,
|
||||
GodUpdateRegionInfo.RegionInfo.SimName,
|
||||
GodUpdateRegionInfo.RegionInfo.RedirectGridX,
|
||||
GodUpdateRegionInfo.RegionInfo.RedirectGridY);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleSimWideDeletes(IClientAPI client, Packet Packet)
|
||||
{
|
||||
SimWideDeletesPacket SimWideDeletesRequest =
|
||||
(SimWideDeletesPacket)Packet;
|
||||
SimWideDeletesDelegate handlerSimWideDeletesRequest = OnSimWideDeletes;
|
||||
if (handlerSimWideDeletesRequest != null)
|
||||
{
|
||||
handlerSimWideDeletesRequest(this, SimWideDeletesRequest.AgentData.AgentID,(int)SimWideDeletesRequest.DataBlock.Flags,SimWideDeletesRequest.DataBlock.TargetID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleGodlikeMessage(IClientAPI client, Packet Packet)
|
||||
{
|
||||
GodlikeMessagePacket GodlikeMessage =
|
||||
(GodlikeMessagePacket)Packet;
|
||||
|
||||
GodlikeMessage handlerGodlikeMessage = onGodlikeMessageEvent;
|
||||
if (handlerGodlikeMessage != null)
|
||||
{
|
||||
handlerGodlikeMessage(this,
|
||||
GodlikeMessage.MethodData.Invoice,
|
||||
GodlikeMessage.MethodData.Method,
|
||||
GodlikeMessage.ParamList[0].Parameter);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleSaveStatePacket(IClientAPI client, Packet Packet)
|
||||
{
|
||||
StateSavePacket SaveStateMessage =
|
||||
(StateSavePacket)Packet;
|
||||
SaveStateHandler handlerSaveStatePacket = OnSaveStateEvent;
|
||||
if (handlerSaveStatePacket != null)
|
||||
{
|
||||
handlerSaveStatePacket(this,SaveStateMessage.AgentData.AgentID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleGodKickUser(IClientAPI sender, Packet Pack)
|
||||
{
|
||||
GodKickUserPacket gkupack = (GodKickUserPacket)Pack;
|
||||
|
|
@ -8618,6 +8999,76 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool HandleUpdateMuteListEntry(IClientAPI client, Packet Packet)
|
||||
{
|
||||
UpdateMuteListEntryPacket UpdateMuteListEntry =
|
||||
(UpdateMuteListEntryPacket)Packet;
|
||||
MuteListEntryUpdate handlerUpdateMuteListEntry = OnUpdateMuteListEntryEvent;
|
||||
if (handlerUpdateMuteListEntry != null)
|
||||
{
|
||||
handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID,
|
||||
Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName),
|
||||
UpdateMuteListEntry.MuteData.MuteType,
|
||||
UpdateMuteListEntry.AgentData.AgentID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleRemoveMuteListEntry(IClientAPI client, Packet Packet)
|
||||
{
|
||||
RemoveMuteListEntryPacket RemoveMuteListEntry =
|
||||
(RemoveMuteListEntryPacket)Packet;
|
||||
MuteListEntryRemove handlerRemoveMuteListEntry = OnRemoveMuteListEntryEvent;
|
||||
if (handlerRemoveMuteListEntry != null)
|
||||
{
|
||||
handlerRemoveMuteListEntry(this,
|
||||
RemoveMuteListEntry.MuteData.MuteID,
|
||||
Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName),
|
||||
RemoveMuteListEntry.AgentData.AgentID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleUserReport(IClientAPI client, Packet Packet)
|
||||
{
|
||||
UserReportPacket UserReport =
|
||||
(UserReportPacket)Packet;
|
||||
|
||||
NewUserReport handlerUserReport = OnUserReportEvent;
|
||||
if (handlerUserReport != null)
|
||||
{
|
||||
handlerUserReport(this,
|
||||
Utils.BytesToString(UserReport.ReportData.AbuseRegionName),
|
||||
UserReport.ReportData.AbuserID,
|
||||
UserReport.ReportData.Category,
|
||||
UserReport.ReportData.CheckFlags,
|
||||
Utils.BytesToString(UserReport.ReportData.Details),
|
||||
UserReport.ReportData.ObjectID,
|
||||
UserReport.ReportData.Position,
|
||||
UserReport.ReportData.ReportType,
|
||||
UserReport.ReportData.ScreenshotID,
|
||||
Utils.BytesToString(UserReport.ReportData.Summary),
|
||||
UserReport.AgentData.AgentID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleSendPostcard(IClientAPI client, Packet packet)
|
||||
{
|
||||
SendPostcardPacket SendPostcard =
|
||||
(SendPostcardPacket)packet;
|
||||
SendPostcard handlerSendPostcard = OnSendPostcard;
|
||||
if (handlerSendPostcard != null)
|
||||
{
|
||||
handlerSendPostcard(this);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack)
|
||||
{
|
||||
|
|
@ -8887,7 +9338,72 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
return true;
|
||||
|
||||
}
|
||||
|
||||
|
||||
private bool HandleGroupVoteHistoryRequest(IClientAPI client, Packet Packet)
|
||||
{
|
||||
GroupVoteHistoryRequestPacket GroupVoteHistoryRequest =
|
||||
(GroupVoteHistoryRequestPacket)Packet;
|
||||
GroupVoteHistoryRequest handlerGroupVoteHistoryRequest = OnGroupVoteHistoryRequest;
|
||||
if (handlerGroupVoteHistoryRequest != null)
|
||||
{
|
||||
handlerGroupVoteHistoryRequest(this, GroupVoteHistoryRequest.AgentData.AgentID,GroupVoteHistoryRequest.AgentData.SessionID,GroupVoteHistoryRequest.GroupData.GroupID,GroupVoteHistoryRequest.TransactionData.TransactionID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleGroupActiveProposalsRequest(IClientAPI client, Packet Packet)
|
||||
{
|
||||
GroupActiveProposalsRequestPacket GroupActiveProposalsRequest =
|
||||
(GroupActiveProposalsRequestPacket)Packet;
|
||||
GroupActiveProposalsRequest handlerGroupActiveProposalsRequest = OnGroupActiveProposalsRequest;
|
||||
if (handlerGroupActiveProposalsRequest != null)
|
||||
{
|
||||
handlerGroupActiveProposalsRequest(this, GroupActiveProposalsRequest.AgentData.AgentID,GroupActiveProposalsRequest.AgentData.SessionID,GroupActiveProposalsRequest.GroupData.GroupID,GroupActiveProposalsRequest.TransactionData.TransactionID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleGroupAccountDetailsRequest(IClientAPI client, Packet Packet)
|
||||
{
|
||||
GroupAccountDetailsRequestPacket GroupAccountDetailsRequest =
|
||||
(GroupAccountDetailsRequestPacket)Packet;
|
||||
GroupAccountDetailsRequest handlerGroupAccountDetailsRequest = OnGroupAccountDetailsRequest;
|
||||
if (handlerGroupAccountDetailsRequest != null)
|
||||
{
|
||||
handlerGroupAccountDetailsRequest(this, GroupAccountDetailsRequest.AgentData.AgentID,GroupAccountDetailsRequest.AgentData.GroupID,GroupAccountDetailsRequest.MoneyData.RequestID,GroupAccountDetailsRequest.AgentData.SessionID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleGroupAccountSummaryRequest(IClientAPI client, Packet Packet)
|
||||
{
|
||||
GroupAccountSummaryRequestPacket GroupAccountSummaryRequest =
|
||||
(GroupAccountSummaryRequestPacket)Packet;
|
||||
GroupAccountSummaryRequest handlerGroupAccountSummaryRequest = OnGroupAccountSummaryRequest;
|
||||
if (handlerGroupAccountSummaryRequest != null)
|
||||
{
|
||||
handlerGroupAccountSummaryRequest(this, GroupAccountSummaryRequest.AgentData.AgentID,GroupAccountSummaryRequest.AgentData.GroupID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleGroupTransactionsDetailsRequest(IClientAPI client, Packet Packet)
|
||||
{
|
||||
GroupAccountTransactionsRequestPacket GroupAccountTransactionsRequest =
|
||||
(GroupAccountTransactionsRequestPacket)Packet;
|
||||
GroupAccountTransactionsRequest handlerGroupAccountTransactionsRequest = OnGroupAccountTransactionsRequest;
|
||||
if (handlerGroupAccountTransactionsRequest != null)
|
||||
{
|
||||
handlerGroupAccountTransactionsRequest(this, GroupAccountTransactionsRequest.AgentData.AgentID,GroupAccountTransactionsRequest.AgentData.GroupID,GroupAccountTransactionsRequest.MoneyData.RequestID,GroupAccountTransactionsRequest.AgentData.SessionID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool HandleGroupTitlesRequest(IClientAPI sender, Packet Pack)
|
||||
{
|
||||
GroupTitlesRequestPacket groupTitlesRequest =
|
||||
|
|
@ -13688,7 +14204,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
if (handlerGodKickUser != null)
|
||||
{
|
||||
handlerGodKickUser(gkupack.UserInfo.GodID, gkupack.UserInfo.GodSessionID,
|
||||
gkupack.UserInfo.AgentID, gkupack.UserInfo.KickFlags, gkupack.UserInfo.Reason,gkupack.UserInfo);
|
||||
gkupack.UserInfo.AgentID, gkupack.UserInfo.KickFlags, gkupack.UserInfo.Reason,gkupack.UserInfo);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -395,7 +395,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
|
|||
|
||||
// if it leaves, we want to know, too
|
||||
client.OnLogout += OnLogout;
|
||||
|
||||
client.OnGrantUserRights += GrantUserFriendRights;
|
||||
client.OnTrackAgentEvent += FindAgent;
|
||||
client.OnFindAgentEvent += FindAgent;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1114,6 +1117,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
|
|||
{
|
||||
((Scene)remoteClient.Scene).CommsManager.UpdateUserFriendPerms(requester, target, (uint)rights);
|
||||
}
|
||||
public void FindAgent(IClientAPI remoteClient, UUID hunter, UUID target)
|
||||
{
|
||||
List<FriendListItem> friendList = GetUserFriends(hunter);
|
||||
foreach (FriendListItem item in friendList)
|
||||
{
|
||||
if(item.onlinestatus == true)
|
||||
{
|
||||
if(item.Friend == target && (item.FriendPerms & (uint)FriendRights.CanSeeOnMap) != 0)
|
||||
{
|
||||
ScenePresence SPTarget = ((Scene)remoteClient.Scene).GetScenePresence(target);
|
||||
string regionname = SPTarget.Scene.RegionInfo.RegionName;
|
||||
remoteClient.SendScriptTeleportRequest("FindAgent", regionname,new Vector3(SPTarget.AbsolutePosition),new Vector3(SPTarget.Lookat));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
remoteClient.SendAgentAlertMessage("The agent you are looking for is not online.", false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public List<FriendListItem> GetUserFriends(UUID agentID)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -708,5 +708,10 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
|
|||
OSD item = EventQueueHelper.GroupMembership(groupUpdate);
|
||||
Enqueue(item, avatarID);
|
||||
}
|
||||
public void QueryReply(PlacesReplyPacket groupUpdate, UUID avatarID)
|
||||
{
|
||||
OSD item = EventQueueHelper.PlacesQuery(groupUpdate);
|
||||
Enqueue(item, avatarID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -454,6 +454,48 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
|
|||
|
||||
return groupUpdate;
|
||||
}
|
||||
|
||||
public static OSD PlacesQuery(PlacesReplyPacket PlacesReply)
|
||||
{
|
||||
OSDMap placesReply = new OSDMap();
|
||||
placesReply.Add("message", OSD.FromString("PlacesReplyMessage"));
|
||||
|
||||
OSDMap body = new OSDMap();
|
||||
OSDArray agentData = new OSDArray();
|
||||
OSDMap agentDataMap = new OSDMap();
|
||||
agentDataMap.Add("AgentID", OSD.FromUUID(PlacesReply.AgentData.AgentID));
|
||||
agentDataMap.Add("QueryID", OSD.FromUUID(PlacesReply.AgentData.QueryID));
|
||||
agentDataMap.Add("TransactionID", OSD.FromUUID(PlacesReply.TransactionData.TransactionID));
|
||||
agentData.Add(agentDataMap);
|
||||
body.Add("AgentData", agentData);
|
||||
|
||||
OSDArray QueryData = new OSDArray();
|
||||
|
||||
foreach (PlacesReplyPacket.QueryDataBlock groupDataBlock in PlacesReply.QueryData)
|
||||
{
|
||||
OSDMap QueryDataMap = new OSDMap();
|
||||
QueryDataMap.Add("ActualArea", OSD.FromInteger(groupDataBlock.ActualArea));
|
||||
QueryDataMap.Add("BillableArea", OSD.FromInteger(groupDataBlock.BillableArea));
|
||||
QueryDataMap.Add("Description", OSD.FromBinary(groupDataBlock.Desc));
|
||||
QueryDataMap.Add("Dwell", OSD.FromInteger((int)groupDataBlock.Dwell));
|
||||
QueryDataMap.Add("Flags", OSD.FromString(Convert.ToString(groupDataBlock.Flags)));
|
||||
QueryDataMap.Add("GlobalX", OSD.FromInteger((int)groupDataBlock.GlobalX));
|
||||
QueryDataMap.Add("GlobalY", OSD.FromInteger((int)groupDataBlock.GlobalY));
|
||||
QueryDataMap.Add("GlobalZ", OSD.FromInteger((int)groupDataBlock.GlobalZ));
|
||||
QueryDataMap.Add("Name", OSD.FromBinary(groupDataBlock.Name));
|
||||
QueryDataMap.Add("OwnerID", OSD.FromUUID(groupDataBlock.OwnerID));
|
||||
QueryDataMap.Add("SimName", OSD.FromBinary(groupDataBlock.SimName));
|
||||
QueryDataMap.Add("SnapShotID", OSD.FromUUID(groupDataBlock.SnapshotID));
|
||||
QueryDataMap.Add("ProductSku", OSD.FromInteger(0));
|
||||
QueryDataMap.Add("Price", OSD.FromInteger(groupDataBlock.Price));
|
||||
|
||||
QueryData.Add(QueryDataMap);
|
||||
}
|
||||
body.Add("QueryData", QueryData);
|
||||
placesReply.Add("QueryData[]", body);
|
||||
|
||||
return placesReply;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -273,6 +273,26 @@ namespace OpenSim.Region.Examples.SimpleModule
|
|||
public event AvatarInterestUpdate OnAvatarInterestUpdate;
|
||||
|
||||
public event PlacesQuery OnPlacesQuery;
|
||||
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
#pragma warning restore 67
|
||||
|
||||
|
|
@ -1103,5 +1123,17 @@ namespace OpenSim.Region.Examples.SimpleModule
|
|||
public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -836,6 +836,25 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
|
|||
public event MuteListRequest OnMuteListRequest;
|
||||
public event AvatarInterestUpdate OnAvatarInterestUpdate;
|
||||
public event PlacesQuery OnPlacesQuery;
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
#pragma warning restore 67
|
||||
|
||||
|
|
@ -1628,5 +1647,17 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
|
|||
public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -379,6 +379,26 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
|||
public event AvatarInterestUpdate OnAvatarInterestUpdate;
|
||||
|
||||
public event PlacesQuery OnPlacesQuery;
|
||||
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
#pragma warning restore 67
|
||||
|
||||
|
|
@ -1108,5 +1128,17 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
|||
public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -287,6 +287,26 @@ namespace OpenSim.Tests.Common.Mock
|
|||
public event AvatarInterestUpdate OnAvatarInterestUpdate;
|
||||
|
||||
public event PlacesQuery OnPlacesQuery;
|
||||
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
#pragma warning restore 67
|
||||
|
||||
|
|
@ -1163,5 +1183,17 @@ namespace OpenSim.Tests.Common.Mock
|
|||
public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
|
||||
{
|
||||
}
|
||||
|
||||
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue