diff options
author | Jeff Ames | 2008-11-09 01:31:38 +0000 |
---|---|---|
committer | Jeff Ames | 2008-11-09 01:31:38 +0000 |
commit | 8da726c3a8a3ab983fc11ad890a0b91016c86a1f (patch) | |
tree | a19c3a3a813bafedf876fb8943c7ef60ccbbb851 /OpenSim/Framework/Client | |
parent | Reintroduce transactionID to the parameter list for SendInstantMessage. (diff) | |
download | opensim-SC-8da726c3a8a3ab983fc11ad890a0b91016c86a1f.zip opensim-SC-8da726c3a8a3ab983fc11ad890a0b91016c86a1f.tar.gz opensim-SC-8da726c3a8a3ab983fc11ad890a0b91016c86a1f.tar.bz2 opensim-SC-8da726c3a8a3ab983fc11ad890a0b91016c86a1f.tar.xz |
Update svn properties. Add copyright headers. Minor formatting cleanup.
Diffstat (limited to 'OpenSim/Framework/Client')
-rw-r--r-- | OpenSim/Framework/Client/IClientChat.cs | 57 | ||||
-rw-r--r-- | OpenSim/Framework/Client/IClientCore.cs | 41 | ||||
-rw-r--r-- | OpenSim/Framework/Client/IClientIM.cs | 121 |
3 files changed, 150 insertions, 69 deletions
diff --git a/OpenSim/Framework/Client/IClientChat.cs b/OpenSim/Framework/Client/IClientChat.cs index 76084ee..c89bf53 100644 --- a/OpenSim/Framework/Client/IClientChat.cs +++ b/OpenSim/Framework/Client/IClientChat.cs | |||
@@ -1,15 +1,42 @@ | |||
1 | using System; | 1 | /* |
2 | using System.Collections.Generic; | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | using System.Text; | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | using OpenMetaverse; | 4 | * |
5 | 5 | * Redistribution and use in source and binary forms, with or without | |
6 | namespace OpenSim.Framework.Client | 6 | * modification, are permitted provided that the following conditions are met: |
7 | { | 7 | * * Redistributions of source code must retain the above copyright |
8 | public interface IClientChat | 8 | * notice, this list of conditions and the following disclaimer. |
9 | { | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | event ChatMessage OnChatFromClient; | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | 11 | * documentation and/or other materials provided with the distribution. | |
12 | void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | byte audible); | 13 | * names of its contributors may be used to endorse or promote products |
14 | } | 14 | * derived from this software without specific prior written permission. |
15 | } | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenMetaverse; | ||
32 | |||
33 | namespace OpenSim.Framework.Client | ||
34 | { | ||
35 | public interface IClientChat | ||
36 | { | ||
37 | event ChatMessage OnChatFromClient; | ||
38 | |||
39 | void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, | ||
40 | byte audible); | ||
41 | } | ||
42 | } | ||
diff --git a/OpenSim/Framework/Client/IClientCore.cs b/OpenSim/Framework/Client/IClientCore.cs index 41f8f4b..78f0411 100644 --- a/OpenSim/Framework/Client/IClientCore.cs +++ b/OpenSim/Framework/Client/IClientCore.cs | |||
@@ -1,8 +1,35 @@ | |||
1 | namespace OpenSim.Framework.Client | 1 | /* |
2 | { | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | public interface IClientCore | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | { | 4 | * |
5 | bool TryGet<T>(out T iface); | 5 | * Redistribution and use in source and binary forms, with or without |
6 | T Get<T>(); | 6 | * modification, are permitted provided that the following conditions are met: |
7 | } | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | namespace OpenSim.Framework.Client | ||
29 | { | ||
30 | public interface IClientCore | ||
31 | { | ||
32 | bool TryGet<T>(out T iface); | ||
33 | T Get<T>(); | ||
34 | } | ||
8 | } \ No newline at end of file | 35 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs index 1d55d10..04c6d6c 100644 --- a/OpenSim/Framework/Client/IClientIM.cs +++ b/OpenSim/Framework/Client/IClientIM.cs | |||
@@ -1,47 +1,74 @@ | |||
1 | using System; | 1 | /* |
2 | using OpenMetaverse; | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | |
4 | namespace OpenSim.Framework.Client | 4 | * |
5 | { | 5 | * Redistribution and use in source and binary forms, with or without |
6 | public class ClientInstantMessageArgs : EventArgs | 6 | * modification, are permitted provided that the following conditions are met: |
7 | { | 7 | * * Redistributions of source code must retain the above copyright |
8 | public IClientCore client; | 8 | * notice, this list of conditions and the following disclaimer. |
9 | public string message; | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | public DateTime time; | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | public ClientInstantMessageSender sender; | 11 | * documentation and/or other materials provided with the distribution. |
12 | } | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | 13 | * names of its contributors may be used to endorse or promote products | |
14 | public class ClientInstantMessageSender | 14 | * derived from this software without specific prior written permission. |
15 | { | 15 | * |
16 | public UUID ID; | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | public bool online; | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | public string name; | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | public Vector3 position; | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | public UUID regionID; | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | } | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | |
23 | public delegate void ClientInstantMessage(Object sender, ClientInstantMessageArgs e); | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | |
25 | public class ClientInstantMessageParms | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | { | 26 | */ |
27 | public ClientInstantMessageSender senderInfo; | 27 | |
28 | } | 28 | using System; |
29 | 29 | using OpenMetaverse; | |
30 | // Porting Guide from old IM | 30 | |
31 | // SendIM(...) | 31 | namespace OpenSim.Framework.Client |
32 | // Loses FromAgentSession - this should be added by implementers manually. | 32 | { |
33 | // | 33 | public class ClientInstantMessageArgs : EventArgs |
34 | 34 | { | |
35 | public interface IClientIM | 35 | public IClientCore client; |
36 | { | 36 | public string message; |
37 | void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, | 37 | public DateTime time; |
38 | string fromName, byte dialog, uint timeStamp); | 38 | public ClientInstantMessageSender sender; |
39 | 39 | } | |
40 | void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, | 40 | |
41 | string fromName, byte dialog, uint timeStamp, | 41 | public class ClientInstantMessageSender |
42 | UUID transactionID, bool fromGroup, | 42 | { |
43 | byte[] binaryBucket); | 43 | public UUID ID; |
44 | 44 | public bool online; | |
45 | event ImprovedInstantMessage OnInstantMessage; | 45 | public string name; |
46 | } | 46 | public Vector3 position; |
47 | } | 47 | public UUID regionID; |
48 | } | ||
49 | |||
50 | public delegate void ClientInstantMessage(Object sender, ClientInstantMessageArgs e); | ||
51 | |||
52 | public class ClientInstantMessageParms | ||
53 | { | ||
54 | public ClientInstantMessageSender senderInfo; | ||
55 | } | ||
56 | |||
57 | // Porting Guide from old IM | ||
58 | // SendIM(...) | ||
59 | // Loses FromAgentSession - this should be added by implementers manually. | ||
60 | // | ||
61 | |||
62 | public interface IClientIM | ||
63 | { | ||
64 | void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, | ||
65 | string fromName, byte dialog, uint timeStamp); | ||
66 | |||
67 | void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, | ||
68 | string fromName, byte dialog, uint timeStamp, | ||
69 | UUID transactionID, bool fromGroup, | ||
70 | byte[] binaryBucket); | ||
71 | |||
72 | event ImprovedInstantMessage OnInstantMessage; | ||
73 | } | ||
74 | } | ||