OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Plumb in EventNotification* and EventGodDelete

0.6.2-post-fixes
Melanie Thielker 2008-12-23 23:41:46 +00:00
parent 8e8abde7d4
commit 318de200bd
5 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/IClientAPI.cs
View File

@ -417,6 +417,10 @@ namespace OpenSim.Framework
public delegate void ClassifiedInfoUpdate(UUID classifiedID, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, Vector3 globalPos, byte classifiedFlags, int price, IClientAPI client); public delegate void ClassifiedInfoUpdate(UUID classifiedID, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, Vector3 globalPos, byte classifiedFlags, int price, IClientAPI client);
public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client); public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client);
public delegate void EventNotificationAddRequest(uint EventID, IClientAPI client);
public delegate void EventNotificationRemoveRequest(uint EventID, IClientAPI client);
public delegate void EventGodDelete(uint eventID, UUID queryID, string queryText, uint queryFlags, int queryStart, IClientAPI client);
#endregion #endregion
@ -733,6 +737,10 @@ namespace OpenSim.Framework
event ClassifiedDelete OnClassifiedDelete; event ClassifiedDelete OnClassifiedDelete;
event ClassifiedDelete OnClassifiedGodDelete; event ClassifiedDelete OnClassifiedGodDelete;
event EventNotificationAddRequest OnEventNotificationAddRequest;
event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
event EventGodDelete OnEventGodDelete;
// void ActivateGesture(UUID assetId, UUID gestureId); // void ActivateGesture(UUID assetId, UUID gestureId);
/// <summary> /// <summary>

44
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -279,6 +279,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private ClassifiedDelete handlerClassifiedDelete; private ClassifiedDelete handlerClassifiedDelete;
private ClassifiedDelete handlerClassifiedGodDelete; private ClassifiedDelete handlerClassifiedGodDelete;
private EventNotificationAddRequest handlerEventNotificationAddRequest;
private EventNotificationRemoveRequest handlerEventNotificationRemoveRequest;
private EventGodDelete handlerEventGodDelete;
private readonly IGroupsModule m_GroupsModule; private readonly IGroupsModule m_GroupsModule;
//private TerrainUnacked handlerUnackedTerrain = null; //private TerrainUnacked handlerUnackedTerrain = null;
@ -1042,6 +1046,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event ClassifiedDelete OnClassifiedDelete; public event ClassifiedDelete OnClassifiedDelete;
public event ClassifiedDelete OnClassifiedGodDelete; public event ClassifiedDelete OnClassifiedGodDelete;
public event EventNotificationAddRequest OnEventNotificationAddRequest;
public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
public event EventGodDelete OnEventGodDelete;
public void ActivateGesture(UUID assetId, UUID gestureId) public void ActivateGesture(UUID assetId, UUID gestureId)
{ {
} }
@ -7280,6 +7288,42 @@ namespace OpenSim.Region.ClientStack.LindenUDP
this); this);
break; break;
case PacketType.EventGodDelete:
EventGodDeletePacket eventGodDelete =
(EventGodDeletePacket)Pack;
handlerEventGodDelete = OnEventGodDelete;
if (handlerEventGodDelete != null)
handlerEventGodDelete(
eventGodDelete.EventData.EventID,
eventGodDelete.QueryData.QueryID,
Utils.BytesToString(
eventGodDelete.QueryData.QueryText),
eventGodDelete.QueryData.QueryFlags,
eventGodDelete.QueryData.QueryStart,
this);
break;
case PacketType.EventNotificationAddRequest:
EventNotificationAddRequestPacket eventNotificationAdd =
(EventNotificationAddRequestPacket)Pack;
handlerEventNotificationAddRequest = OnEventNotificationAddRequest;
if (handlerEventNotificationAddRequest != null)
handlerEventNotificationAddRequest(
eventNotificationAdd.EventData.EventID, this);
break;
case PacketType.EventNotificationRemoveRequest:
EventNotificationRemoveRequestPacket eventNotificationRemove =
(EventNotificationRemoveRequestPacket)Pack;
handlerEventNotificationRemoveRequest = OnEventNotificationRemoveRequest;
if (handlerEventNotificationRemoveRequest != null)
handlerEventNotificationRemoveRequest(
eventNotificationRemove.EventData.EventID, this);
break;
default: default:
m_log.Warn("[CLIENT]: unhandled packet " + Pack); m_log.Warn("[CLIENT]: unhandled packet " + Pack);
break; break;

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

@ -351,6 +351,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
public event ClassifiedDelete OnClassifiedDelete; public event ClassifiedDelete OnClassifiedDelete;
public event ClassifiedDelete OnClassifiedGodDelete; public event ClassifiedDelete OnClassifiedGodDelete;
public event EventNotificationAddRequest OnEventNotificationAddRequest;
public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
public event EventGodDelete OnEventGodDelete;
#pragma warning restore 67 #pragma warning restore 67
#endregion #endregion

4
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -246,6 +246,10 @@ namespace OpenSim.Region.Examples.SimpleModule
public event ClassifiedDelete OnClassifiedDelete; public event ClassifiedDelete OnClassifiedDelete;
public event ClassifiedDelete OnClassifiedGodDelete; public event ClassifiedDelete OnClassifiedGodDelete;
public event EventNotificationAddRequest OnEventNotificationAddRequest;
public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
public event EventGodDelete OnEventGodDelete;
#pragma warning restore 67 #pragma warning restore 67
private UUID myID = UUID.Random(); private UUID myID = UUID.Random();

4
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -242,6 +242,10 @@ namespace OpenSim.Tests.Common.Mock
public event ClassifiedDelete OnClassifiedDelete; public event ClassifiedDelete OnClassifiedDelete;
public event ClassifiedDelete OnClassifiedGodDelete; public event ClassifiedDelete OnClassifiedGodDelete;
public event EventNotificationAddRequest OnEventNotificationAddRequest;
public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
public event EventGodDelete OnEventGodDelete;
#pragma warning restore 67 #pragma warning restore 67
/// <value> /// <value>