1 files changed, 103 insertions, 103 deletions
diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index 4d6b59c..f5b8272 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -1,103 +1,103 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using libsecondlife;
+using libsecondlife;
-using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
+using OpenSim.Framework.Types;
-using System.Collections.Generic;
+using System.Collections.Generic;
-namespace OpenSim.Framework
+namespace OpenSim.Framework
-{
+{
-    public class RegionCommsListener :IRegionCommsListener
+    public class RegionCommsListener :IRegionCommsListener
-    {
+    {
-        public event ExpectUserDelegate OnExpectUser;
+        public event ExpectUserDelegate OnExpectUser;
-        public event GenericCall2 OnExpectChildAgent;
+        public event GenericCall2 OnExpectChildAgent;
-        public event AgentCrossing OnAvatarCrossingIntoRegion;
+        public event AgentCrossing OnAvatarCrossingIntoRegion;
-        public event UpdateNeighbours OnNeighboursUpdate;
+        public event UpdateNeighbours OnNeighboursUpdate;
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        /// <param name="agent"></param>
+        /// <param name="agent"></param>
-        /// <returns></returns>
+        /// <returns></returns>
-        public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData  agent)
+        public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData  agent)
-        {
+        {
-            if(OnExpectUser != null)
+            if(OnExpectUser != null)
-            {
+            {
-                
+                
-                OnExpectUser(regionHandle, agent);
+                OnExpectUser(regionHandle, agent);
-                return true;
+                return true;
-            }
+            }
-            return false;
+            return false;
-        }
+        }
-        public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
+        public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
-        {
+        {
-            if (OnAvatarCrossingIntoRegion != null)
+            if (OnAvatarCrossingIntoRegion != null)
-            {
+            {
-                OnAvatarCrossingIntoRegion(regionHandle, agentID, position);
+                OnAvatarCrossingIntoRegion(regionHandle, agentID, position);
-                return true;
+                return true;
-            }
+            }
-            return false;
+            return false;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        /// <remarks>TODO: Doesnt take any args??</remarks>
+        /// <remarks>TODO: Doesnt take any args??</remarks>
-        /// <returns></returns>
+        /// <returns></returns>
-        public virtual bool TriggerExpectChildAgent()
+        public virtual bool TriggerExpectChildAgent()
-        {
+        {
-            if (OnExpectChildAgent != null)
+            if (OnExpectChildAgent != null)
-            {
+            {
-                OnExpectChildAgent();
+                OnExpectChildAgent();
-                return true;
+                return true;
-            }
+            }
-            return false;
+            return false;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        /// <remarks>Added to avoid a unused compiler warning on OnNeighboursUpdate, TODO: Check me</remarks>
+        /// <remarks>Added to avoid a unused compiler warning on OnNeighboursUpdate, TODO: Check me</remarks>
-        /// <param name="neighbours"></param>
+        /// <param name="neighbours"></param>
-        /// <returns></returns>
+        /// <returns></returns>
-        public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours)
+        public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours)
-        {
+        {
-            if (OnNeighboursUpdate != null)
+            if (OnNeighboursUpdate != null)
-            {
+            {
-                OnNeighboursUpdate(neighbours);
+                OnNeighboursUpdate(neighbours);
-                return true;
+                return true;
-            }
+            }
-            return false;
+            return false;
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs index 4d6b59c..f5b8272 100644 --- a/OpenSim/Framework/General/RegionCommsListener.cs +++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -1,103 +1,103 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/	2	* Copyright (c) Contributors, http://www.openmetaverse.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	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	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	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	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.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28	using libsecondlife;	28	using libsecondlife;
29	using OpenSim.Framework.Interfaces;	29	using OpenSim.Framework.Interfaces;
30	using OpenSim.Framework.Types;	30	using OpenSim.Framework.Types;
31		31
32	using System.Collections.Generic;	32	using System.Collections.Generic;
33		33
34	namespace OpenSim.Framework	34	namespace OpenSim.Framework
35	{	35	{
36	public class RegionCommsListener :IRegionCommsListener	36	public class RegionCommsListener :IRegionCommsListener
37	{	37	{
38	public event ExpectUserDelegate OnExpectUser;	38	public event ExpectUserDelegate OnExpectUser;
39	public event GenericCall2 OnExpectChildAgent;	39	public event GenericCall2 OnExpectChildAgent;
40	public event AgentCrossing OnAvatarCrossingIntoRegion;	40	public event AgentCrossing OnAvatarCrossingIntoRegion;
41	public event UpdateNeighbours OnNeighboursUpdate;	41	public event UpdateNeighbours OnNeighboursUpdate;
42		42
43	/// <summary>	43	/// <summary>
44	///	44	///
45	/// </summary>	45	/// </summary>
46	/// <param name="agent"></param>	46	/// <param name="agent"></param>
47	/// <returns></returns>	47	/// <returns></returns>
48	public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)	48	public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)
49	{	49	{
50	if(OnExpectUser != null)	50	if(OnExpectUser != null)
51	{	51	{
52		52
53	OnExpectUser(regionHandle, agent);	53	OnExpectUser(regionHandle, agent);
54	return true;	54	return true;
55	}	55	}
56		56
57	return false;	57	return false;
58	}	58	}
59		59
60	public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)	60	public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
61	{	61	{
62	if (OnAvatarCrossingIntoRegion != null)	62	if (OnAvatarCrossingIntoRegion != null)
63	{	63	{
64	OnAvatarCrossingIntoRegion(regionHandle, agentID, position);	64	OnAvatarCrossingIntoRegion(regionHandle, agentID, position);
65	return true;	65	return true;
66	}	66	}
67	return false;	67	return false;
68	}	68	}
69		69
70	/// <summary>	70	/// <summary>
71	///	71	///
72	/// </summary>	72	/// </summary>
73	/// <remarks>TODO: Doesnt take any args??</remarks>	73	/// <remarks>TODO: Doesnt take any args??</remarks>
74	/// <returns></returns>	74	/// <returns></returns>
75	public virtual bool TriggerExpectChildAgent()	75	public virtual bool TriggerExpectChildAgent()
76	{	76	{
77	if (OnExpectChildAgent != null)	77	if (OnExpectChildAgent != null)
78	{	78	{
79	OnExpectChildAgent();	79	OnExpectChildAgent();
80	return true;	80	return true;
81	}	81	}
82		82
83	return false;	83	return false;
84	}	84	}
85		85
86	/// <summary>	86	/// <summary>
87	///	87	///
88	/// </summary>	88	/// </summary>
89	/// <remarks>Added to avoid a unused compiler warning on OnNeighboursUpdate, TODO: Check me</remarks>	89	/// <remarks>Added to avoid a unused compiler warning on OnNeighboursUpdate, TODO: Check me</remarks>
90	/// <param name="neighbours"></param>	90	/// <param name="neighbours"></param>
91	/// <returns></returns>	91	/// <returns></returns>
92	public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours)	92	public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours)
93	{	93	{
94	if (OnNeighboursUpdate != null)	94	if (OnNeighboursUpdate != null)
95	{	95	{
96	OnNeighboursUpdate(neighbours);	96	OnNeighboursUpdate(neighbours);
97	return true;	97	return true;
98	}	98	}
99		99
100	return false;	100	return false;
101	}	101	}
102	}	102	}
103	}	103	}