aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2007-07-30 20:08:33 +0000
committerSean Dague2007-07-30 20:08:33 +0000
commita47e2d9ae74f0ea2484ab38156f52605b08f9be2 (patch)
treee4030c1bb38c31cb36ebdc0c0a58ccaba8b4b97a
parent* Raised ping timeout to 150 seconds (diff)
downloadopensim-SC_OLD-a47e2d9ae74f0ea2484ab38156f52605b08f9be2.zip
opensim-SC_OLD-a47e2d9ae74f0ea2484ab38156f52605b08f9be2.tar.gz
opensim-SC_OLD-a47e2d9ae74f0ea2484ab38156f52605b08f9be2.tar.bz2
opensim-SC_OLD-a47e2d9ae74f0ea2484ab38156f52605b08f9be2.tar.xz
added OnDisconnectUser event to required classes
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs2
-rw-r--r--OpenSim/Framework/General/NullClientAPI.cs291
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs1
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs1
4 files changed, 150 insertions, 145 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 1e2889c..3162e9c 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -43,6 +43,7 @@ namespace OpenSim.Framework.Interfaces
43 public delegate void LinkObjects(uint parent, List<uint> children); 43 public delegate void LinkObjects(uint parent, List<uint> children);
44 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY); 44 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY);
45 public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags); 45 public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);
46 public delegate void DisconnectUser();
46 47
47 public delegate void GenericCall(IClientAPI remoteClient); 48 public delegate void GenericCall(IClientAPI remoteClient);
48 public delegate void GenericCall2(); 49 public delegate void GenericCall2();
@@ -97,6 +98,7 @@ namespace OpenSim.Framework.Interfaces
97 event LinkObjects OnLinkObjects; 98 event LinkObjects OnLinkObjects;
98 event RequestMapBlocks OnRequestMapBlocks; 99 event RequestMapBlocks OnRequestMapBlocks;
99 event TeleportLocationRequest OnTeleportLocationRequest; 100 event TeleportLocationRequest OnTeleportLocationRequest;
101 event DisconnectUser OnDisconnectUser;
100 102
101 event GenericCall4 OnDeRezObject; 103 event GenericCall4 OnDeRezObject;
102 event GenericCall OnRegionHandShakeReply; 104 event GenericCall OnRegionHandShakeReply;
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index c0b4e8a..7c6c6689 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -1,145 +1,146 @@
1using System.Collections.Generic; 1using System.Collections.Generic;
2using System.Net; 2using System.Net;
3using OpenSim.Framework.Interfaces; 3using OpenSim.Framework.Interfaces;
4using OpenSim.Framework.Types; 4using OpenSim.Framework.Types;
5using OpenSim.Framework.Data; 5using OpenSim.Framework.Data;
6using libsecondlife; 6using libsecondlife;
7using libsecondlife.Packets; 7using libsecondlife.Packets;
8 8
9 9
10namespace OpenSim.Framework 10namespace OpenSim.Framework
11{ 11{
12 public class NullClientAPI : IClientAPI 12 public class NullClientAPI : IClientAPI
13 { 13 {
14#pragma warning disable 67 14#pragma warning disable 67
15 public event ImprovedInstantMessage OnInstantMessage; 15 public event ImprovedInstantMessage OnInstantMessage;
16 public event ChatFromViewer OnChatFromViewer; 16 public event ChatFromViewer OnChatFromViewer;
17 public event RezObject OnRezObject; 17 public event RezObject OnRezObject;
18 public event ModifyTerrain OnModifyTerrain; 18 public event ModifyTerrain OnModifyTerrain;
19 public event SetAppearance OnSetAppearance; 19 public event SetAppearance OnSetAppearance;
20 public event StartAnim OnStartAnim; 20 public event StartAnim OnStartAnim;
21 public event LinkObjects OnLinkObjects; 21 public event LinkObjects OnLinkObjects;
22 public event RequestMapBlocks OnRequestMapBlocks; 22 public event RequestMapBlocks OnRequestMapBlocks;
23 public event TeleportLocationRequest OnTeleportLocationRequest; 23 public event TeleportLocationRequest OnTeleportLocationRequest;
24 24 public event DisconnectUser OnDisconnectUser;
25 public event GenericCall4 OnDeRezObject; 25
26 public event GenericCall OnRegionHandShakeReply; 26 public event GenericCall4 OnDeRezObject;
27 public event GenericCall OnRequestWearables; 27 public event GenericCall OnRegionHandShakeReply;
28 public event GenericCall2 OnCompleteMovementToRegion; 28 public event GenericCall OnRequestWearables;
29 public event UpdateAgent OnAgentUpdate; 29 public event GenericCall2 OnCompleteMovementToRegion;
30 public event GenericCall OnRequestAvatarsData; 30 public event UpdateAgent OnAgentUpdate;
31 public event AddNewPrim OnAddPrim; 31 public event GenericCall OnRequestAvatarsData;
32 public event ObjectDuplicate OnObjectDuplicate; 32 public event AddNewPrim OnAddPrim;
33 public event UpdateVector OnGrapObject; 33 public event ObjectDuplicate OnObjectDuplicate;
34 public event ObjectSelect OnDeGrapObject; 34 public event UpdateVector OnGrapObject;
35 public event MoveObject OnGrapUpdate; 35 public event ObjectSelect OnDeGrapObject;
36 36 public event MoveObject OnGrapUpdate;
37 public event UpdateShape OnUpdatePrimShape; 37
38 public event ObjectExtraParams OnUpdateExtraParams; 38 public event UpdateShape OnUpdatePrimShape;
39 public event ObjectSelect OnObjectSelect; 39 public event ObjectExtraParams OnUpdateExtraParams;
40 public event GenericCall7 OnObjectDescription; 40 public event ObjectSelect OnObjectSelect;
41 public event GenericCall7 OnObjectName; 41 public event GenericCall7 OnObjectDescription;
42 public event UpdatePrimFlags OnUpdatePrimFlags; 42 public event GenericCall7 OnObjectName;
43 public event UpdatePrimTexture OnUpdatePrimTexture; 43 public event UpdatePrimFlags OnUpdatePrimFlags;
44 public event UpdateVector OnUpdatePrimGroupPosition; 44 public event UpdatePrimTexture OnUpdatePrimTexture;
45 public event UpdateVector OnUpdatePrimSinglePosition; 45 public event UpdateVector OnUpdatePrimGroupPosition;
46 public event UpdatePrimRotation OnUpdatePrimGroupRotation; 46 public event UpdateVector OnUpdatePrimSinglePosition;
47 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; 47 public event UpdatePrimRotation OnUpdatePrimGroupRotation;
48 public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation; 48 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
49 public event UpdateVector OnUpdatePrimScale; 49 public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
50 public event StatusChange OnChildAgentStatus; 50 public event UpdateVector OnUpdatePrimScale;
51 public event GenericCall2 OnStopMovement; 51 public event StatusChange OnChildAgentStatus;
52 public event GenericCall6 OnRemoveAvatar; 52 public event GenericCall2 OnStopMovement;
53 53 public event GenericCall6 OnRemoveAvatar;
54 public event CreateNewInventoryItem OnCreateNewInventoryItem; 54
55 public event CreateInventoryFolder OnCreateNewInventoryFolder; 55 public event CreateNewInventoryItem OnCreateNewInventoryItem;
56 public event FetchInventoryDescendents OnFetchInventoryDescendents; 56 public event CreateInventoryFolder OnCreateNewInventoryFolder;
57 public event FetchInventory OnFetchInventory; 57 public event FetchInventoryDescendents OnFetchInventoryDescendents;
58 public event RequestTaskInventory OnRequestTaskInventory; 58 public event FetchInventory OnFetchInventory;
59 59 public event RequestTaskInventory OnRequestTaskInventory;
60 public event UUIDNameRequest OnNameFromUUIDRequest; 60
61 61 public event UUIDNameRequest OnNameFromUUIDRequest;
62 public event ParcelPropertiesRequest OnParcelPropertiesRequest; 62
63 public event ParcelDivideRequest OnParcelDivideRequest; 63 public event ParcelPropertiesRequest OnParcelPropertiesRequest;
64 public event ParcelJoinRequest OnParcelJoinRequest; 64 public event ParcelDivideRequest OnParcelDivideRequest;
65 public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; 65 public event ParcelJoinRequest OnParcelJoinRequest;
66 public event ParcelSelectObjects OnParcelSelectObjects; 66 public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
67 public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; 67 public event ParcelSelectObjects OnParcelSelectObjects;
68 public event ObjectDeselect OnObjectDeselect; 68 public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
69 69 public event ObjectDeselect OnObjectDeselect;
70 70
71 public event EstateOwnerMessageRequest OnEstateOwnerMessage; 71
72#pragma warning restore 67 72 public event EstateOwnerMessageRequest OnEstateOwnerMessage;
73 73#pragma warning restore 67
74 private LLUUID m_uuid = LLUUID.Random(); 74
75 public virtual LLVector3 StartPos 75 private LLUUID m_uuid = LLUUID.Random();
76 { 76 public virtual LLVector3 StartPos
77 get { return new LLVector3(); } 77 {
78 set { } 78 get { return new LLVector3(); }
79 } 79 set { }
80 80 }
81 public virtual LLUUID AgentId 81
82 { 82 public virtual LLUUID AgentId
83 get { return m_uuid; } 83 {
84 } 84 get { return m_uuid; }
85 85 }
86 public LLUUID SessionId 86
87 { 87 public LLUUID SessionId
88 get { return LLUUID.Zero; } 88 {
89 } 89 get { return LLUUID.Zero; }
90 90 }
91 public virtual string FirstName 91
92 { 92 public virtual string FirstName
93 get { return ""; } 93 {
94 } 94 get { return ""; }
95 95 }
96 public virtual string LastName 96
97 { 97 public virtual string LastName
98 get { return ""; } 98 {
99 } 99 get { return ""; }
100 100 }
101 public NullClientAPI() 101
102 { 102 public NullClientAPI()
103 } 103 {
104 104 }
105 public virtual void OutPacket(Packet newPack){} 105
106 public virtual void SendWearables(AvatarWearable[] wearables){} 106 public virtual void OutPacket(Packet newPack){}
107 public virtual void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry) { } 107 public virtual void SendWearables(AvatarWearable[] wearables){}
108 public virtual void SendStartPingCheck(byte seq){} 108 public virtual void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry) { }
109 public virtual void SendKillObject(ulong regionHandle, uint localID){} 109 public virtual void SendStartPingCheck(byte seq){}
110 public virtual void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId){} 110 public virtual void SendKillObject(ulong regionHandle, uint localID){}
111 public virtual void SendRegionHandshake(RegionInfo regionInfo){} 111 public virtual void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId){}
112 public virtual void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID){} 112 public virtual void SendRegionHandshake(RegionInfo regionInfo){}
113 public virtual void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID){} 113 public virtual void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID){}
114 public virtual void SendInstantMessage(string message, LLUUID target, string fromName){} 114 public virtual void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID){}
115 public virtual void SendLayerData(float[] map){} 115 public virtual void SendInstantMessage(string message, LLUUID target, string fromName){}
116 public virtual void SendLayerData(int px, int py, float[] map){} 116 public virtual void SendLayerData(float[] map){}
117 public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){} 117 public virtual void SendLayerData(int px, int py, float[] map){}
118 public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){} 118 public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){}
119 public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); } 119 public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){}
120 public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint){} 120 public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); }
121 public virtual void SendMapBlock(List<MapBlockData> mapBlocks){} 121 public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint){}
122 public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){} 122 public virtual void SendMapBlock(List<MapBlockData> mapBlocks){}
123 public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags){} 123 public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){}
124 public virtual void SendTeleportCancel(){} 124 public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags){}
125 public virtual void SendTeleportLocationStart(){} 125 public virtual void SendTeleportCancel(){}
126 public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){} 126 public virtual void SendTeleportLocationStart(){}
127 127 public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){}
128 public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry){} 128
129 public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity){} 129 public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry){}
130 130 public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity){}
131 public virtual void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint){} 131
132 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem){} 132 public virtual void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint){}
133 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem){} 133 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem){}
134 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation){} 134 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem){}
135 135 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation){}
136 public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){} 136
137 public virtual void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item){} 137 public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){}
138 public virtual void SendInventoryItemUpdate(InventoryItemBase Item) { } 138 public virtual void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item){}
139 public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) { } 139 public virtual void SendInventoryItemUpdate(InventoryItemBase Item) { }
140 140 public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) { }
141 public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){} 141
142 public void SendAlertMessage(string message) { } 142 public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){}
143 public void SendAgentAlertMessage(string message, bool modal) { } 143 public void SendAlertMessage(string message) { }
144 } 144 public void SendAgentAlertMessage(string message, bool modal) { }
145} 145 }
146}
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 4b0352b..392745f 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -79,6 +79,7 @@ namespace OpenSim.Region.ClientStack
79 public event GenericCall6 OnRemoveAvatar; 79 public event GenericCall6 OnRemoveAvatar;
80 public event RequestMapBlocks OnRequestMapBlocks; 80 public event RequestMapBlocks OnRequestMapBlocks;
81 public event TeleportLocationRequest OnTeleportLocationRequest; 81 public event TeleportLocationRequest OnTeleportLocationRequest;
82 public event DisconnectUser OnDisconnectUser;
82 83
83 public event CreateNewInventoryItem OnCreateNewInventoryItem; 84 public event CreateNewInventoryItem OnCreateNewInventoryItem;
84 public event CreateInventoryFolder OnCreateNewInventoryFolder; 85 public event CreateInventoryFolder OnCreateNewInventoryFolder;
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index b9ffb71..f7d9b79 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -34,6 +34,7 @@ namespace SimpleApp
34 public event LinkObjects OnLinkObjects; 34 public event LinkObjects OnLinkObjects;
35 public event RequestMapBlocks OnRequestMapBlocks; 35 public event RequestMapBlocks OnRequestMapBlocks;
36 public event TeleportLocationRequest OnTeleportLocationRequest; 36 public event TeleportLocationRequest OnTeleportLocationRequest;
37 public event DisconnectUser OnDisconnectUser;
37 38
38 public event GenericCall4 OnDeRezObject; 39 public event GenericCall4 OnDeRezObject;
39 public event GenericCall OnRegionHandShakeReply; 40 public event GenericCall OnRegionHandShakeReply;