Add PlacesQuery packet

0.6.5-rc1
Melanie Thielker 2009-04-20 20:43:48 +00:00
parent c5a3ff231f
commit d91330ea35
6 changed files with 32 additions and 0 deletions

View File

@ -754,6 +754,8 @@ namespace OpenSim.Client.MXP.ClientStack
public event MuteListRequest OnMuteListRequest; public event MuteListRequest OnMuteListRequest;
public event AvatarInterestUpdate OnAvatarInterestUpdate; public event AvatarInterestUpdate OnAvatarInterestUpdate;
public event PlacesQuery OnPlacesQuery;
#pragma warning restore 67 #pragma warning restore 67
#endregion #endregion

View File

@ -442,6 +442,7 @@ namespace OpenSim.Framework
public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes); public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes);
public delegate void MuteListRequest(IClientAPI client, uint muteCRC); public delegate void MuteListRequest(IClientAPI client, uint muteCRC);
public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages); public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client);
#endregion #endregion
@ -783,6 +784,8 @@ namespace OpenSim.Framework
event MuteListRequest OnMuteListRequest; event MuteListRequest OnMuteListRequest;
event PlacesQuery OnPlacesQuery;
/// <summary> /// <summary>
/// Set the debug level at which packet output should be printed to console. /// Set the debug level at which packet output should be printed to console.
/// </summary> /// </summary>

View File

@ -313,6 +313,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//private AvatarInterestUpdate handlerAvatarInterestUpdate; //private AvatarInterestUpdate handlerAvatarInterestUpdate;
private PlacesQuery handlerPlacesQuery;
private readonly IGroupsModule m_GroupsModule; private readonly IGroupsModule m_GroupsModule;
//private TerrainUnacked handlerUnackedTerrain = null; //private TerrainUnacked handlerUnackedTerrain = null;
@ -1112,6 +1114,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//public event AvatarInterestUpdate OnAvatarInterestUpdate; //public event AvatarInterestUpdate OnAvatarInterestUpdate;
public event PlacesQuery OnPlacesQuery;
public void ActivateGesture(UUID assetId, UUID gestureId) public void ActivateGesture(UUID assetId, UUID gestureId)
{ {
} }
@ -9140,6 +9144,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// //
// break; // break;
case PacketType.PlacesQuery:
PlacesQueryPacket placesQueryPacket =
(PlacesQueryPacket)Pack;
handlerPlacesQuery = OnPlacesQuery;
if (handlerPlacesQuery != null)
handlerPlacesQuery(placesQueryPacket.AgentData.QueryID,
placesQueryPacket.TransactionData.TransactionID,
Utils.BytesToString(
placesQueryPacket.QueryData.QueryText),
placesQueryPacket.QueryData.QueryFlags,
(byte)placesQueryPacket.QueryData.Category,
Utils.BytesToString(
placesQueryPacket.QueryData.SimName),
this);
break;
default: default:
m_log.Warn("[CLIENT]: unhandled packet " + Pack); m_log.Warn("[CLIENT]: unhandled packet " + Pack);
break; break;

View File

@ -269,6 +269,8 @@ namespace OpenSim.Region.Examples.SimpleModule
public event AvatarInterestUpdate OnAvatarInterestUpdate; public event AvatarInterestUpdate OnAvatarInterestUpdate;
public event PlacesQuery OnPlacesQuery;
#pragma warning restore 67 #pragma warning restore 67
private UUID myID = UUID.Random(); private UUID myID = UUID.Random();

View File

@ -375,6 +375,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
public event AvatarInterestUpdate OnAvatarInterestUpdate; public event AvatarInterestUpdate OnAvatarInterestUpdate;
public event PlacesQuery OnPlacesQuery;
#pragma warning restore 67 #pragma warning restore 67
#endregion #endregion

View File

@ -282,6 +282,8 @@ namespace OpenSim.Tests.Common.Mock
public event AvatarInterestUpdate OnAvatarInterestUpdate; public event AvatarInterestUpdate OnAvatarInterestUpdate;
public event PlacesQuery OnPlacesQuery;
#pragma warning restore 67 #pragma warning restore 67
/// <value> /// <value>