4 files changed, 151 insertions, 70 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index 0329e0f..1815330 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Framework
        public void Clear()
        {
-            lock(m_queueSync)
+            lock (m_queueSync)
            {
                m_pqueue.Clear();
                m_queue.Clear();
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 @@
-using System;
+/*
-using System.Collections.Generic;
+ * Copyright (c) Contributors, http://opensimulator.org/
-using System.Text;
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
-using OpenMetaverse;
+ *
+ * Redistribution and use in source and binary forms, with or without
-namespace OpenSim.Framework.Client
+ * modification, are permitted provided that the following conditions are met:
-{
+ *     * Redistributions of source code must retain the above copyright
-    public interface IClientChat
+ *       notice, this list of conditions and the following disclaimer.
-    {
+ *     * Redistributions in binary form must reproduce the above copyright
-        event ChatMessage OnChatFromClient;
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
-        void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
+ *     * Neither the name of the OpenSimulator Project nor the
-                     byte audible);
+ *       names of its contributors may be used to endorse or promote products
-    }
+ *       derived from this software without specific prior written permission.
-}
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenMetaverse;
+namespace OpenSim.Framework.Client
+{
+    public interface IClientChat
+    {
+        event ChatMessage OnChatFromClient;
+        void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
+                             byte audible);
+    }
+}
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 @@
-namespace OpenSim.Framework.Client
+/*
-{
+ * Copyright (c) Contributors, http://opensimulator.org/
-    public interface IClientCore
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
-    {
+ *
-        bool TryGet<T>(out T iface);
+ * Redistribution and use in source and binary forms, with or without
-        T Get<T>();
+ * modification, are permitted provided that the following conditions are met:
-    }
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+namespace OpenSim.Framework.Client
+{
+    public interface IClientCore
+    {
+        bool TryGet<T>(out T iface);
+        T Get<T>();
+    }
 }
 \ 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 @@
-using System;
+/*
-using OpenMetaverse;
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
-namespace OpenSim.Framework.Client
+ *
-{
+ * Redistribution and use in source and binary forms, with or without
-    public class ClientInstantMessageArgs : EventArgs
+ * modification, are permitted provided that the following conditions are met:
-    {
+ *     * Redistributions of source code must retain the above copyright
-        public IClientCore client;
+ *       notice, this list of conditions and the following disclaimer.
-        public string message;
+ *     * Redistributions in binary form must reproduce the above copyright
-        public DateTime time;
+ *       notice, this list of conditions and the following disclaimer in the
-        public ClientInstantMessageSender sender;
+ *       documentation and/or other materials provided with the distribution.
-    }
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
-    public class ClientInstantMessageSender
+ *       derived from this software without specific prior written permission.
-    {
+ *
-        public UUID ID;
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
-        public bool online;
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-        public string name;
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        public Vector3 position;
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-        public UUID regionID;
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    }
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    public delegate void ClientInstantMessage(Object sender, ClientInstantMessageArgs e);
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    public class ClientInstantMessageParms
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    {
+ */
-        public ClientInstantMessageSender senderInfo;
-    }
+using System;
+using OpenMetaverse;
-    // Porting Guide from old IM
-    // SendIM(...)
+namespace OpenSim.Framework.Client
-    //      Loses FromAgentSession - this should be added by implementers manually.
+{
-    //      
+    public class ClientInstantMessageArgs : EventArgs
+    {
-    public interface IClientIM
+        public IClientCore client;
-    {
+        public string message;
-        void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
+        public DateTime time;
-                        string fromName, byte dialog, uint timeStamp);
+        public ClientInstantMessageSender sender;
+    }
-        void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
-                                string fromName, byte dialog, uint timeStamp,
+    public class ClientInstantMessageSender
-                                UUID transactionID, bool fromGroup,
+    {
-                                byte[] binaryBucket);
+        public UUID ID;
+        public bool online;
-        event ImprovedInstantMessage OnInstantMessage;
+        public string name;
-    }
+        public Vector3 position;
-}
+        public UUID regionID;
+    }
+    public delegate void ClientInstantMessage(Object sender, ClientInstantMessageArgs e);
+    public class ClientInstantMessageParms
+    {
+        public ClientInstantMessageSender senderInfo;
+    }
+    // Porting Guide from old IM
+    // SendIM(...)
+    //      Loses FromAgentSession - this should be added by implementers manually.
+    //      
+    public interface IClientIM
+    {
+        void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
+                                string fromName, byte dialog, uint timeStamp);
+        void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
+                                string fromName, byte dialog, uint timeStamp,
+                                UUID transactionID, bool fromGroup,
+                                byte[] binaryBucket);
+        event ImprovedInstantMessage OnInstantMessage;
+    }
+}

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs index 0329e0f..1815330 100644 --- a/OpenSim/Framework/BlockingQueue.cs +++ b/OpenSim/Framework/BlockingQueue.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Framework
114		114
115	public void Clear()	115	public void Clear()
116	{	116	{
117	lock(m_queueSync)	117	lock (m_queueSync)
118	{	118	{
119	m_pqueue.Clear();	119	m_pqueue.Clear();
120	m_queue.Clear();	120	m_queue.Clear();


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	}