Update svn properties.

author: Jeff Ames 2008-11-25 16:00:55 +0000
committer: Jeff Ames 2008-11-25 16:00:55 +0000
commit: 518a8b9f2ac09a5060e2e59c913dfbe7faf397ef (patch)
tree: 8b3e39fbd54452e031873d31ff099e7db064cdee /OpenSim/Framework
parent: * minor: eliminate mono compiler warnings (diff)
download: opensim-SC_OLD-518a8b9f2ac09a5060e2e59c913dfbe7faf397ef.zip
opensim-SC_OLD-518a8b9f2ac09a5060e2e59c913dfbe7faf397ef.tar.gz
opensim-SC_OLD-518a8b9f2ac09a5060e2e59c913dfbe7faf397ef.tar.bz2
opensim-SC_OLD-518a8b9f2ac09a5060e2e59c913dfbe7faf397ef.tar.xz
3 files changed, 212 insertions, 212 deletions
diff --git a/OpenSim/Framework/Communications/IHyperlink.cs b/OpenSim/Framework/Communications/IHyperlink.cs
index 77815f1..02ba2c2 100644
--- a/OpenSim/Framework/Communications/IHyperlink.cs
+++ b/OpenSim/Framework/Communications/IHyperlink.cs
@@ -1,42 +1,42 @@
-/**
+/**
- * Copyright (c) 2008, Contributors. All rights reserved.
+ * Copyright (c) 2008, Contributors. All rights reserved.
- * 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 modification, 
+ * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
+ * are permitted provided that the following conditions are met:
- * 
+ * 
- *     * Redistributions of source code must retain the above copyright notice, 
+ *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
+ *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
+ *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
+ *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
+ *       and/or other materials provided with the distribution.
- *     * Neither the name of the Organizations nor the names of Individual
+ *     * Neither the name of the Organizations nor the names of Individual
- *       Contributors may be used to endorse or promote products derived from 
+ *       Contributors may be used to endorse or promote products derived from 
- *       this software without specific prior written permission.
+ *       this software without specific prior written permission.
- * 
+ * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+ * 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 
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
- * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
+ * 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 
+ * 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 
+ * 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 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ * 
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-using OpenSim.Framework;
+using OpenSim.Framework;
-namespace OpenSim.Framework.Communications
+namespace OpenSim.Framework.Communications
-{
+{
-    public interface IHyperlink
+    public interface IHyperlink
-    {
+    {
-        bool IsHyperlinkRegion(ulong handle);
+        bool IsHyperlinkRegion(ulong handle);
-        RegionInfo GetHyperlinkRegion(ulong handle);
+        RegionInfo GetHyperlinkRegion(ulong handle);
-        ulong FindRegionHandle(ulong handle);
+        ulong FindRegionHandle(ulong handle);
-    }
+    }
-}
+}
diff --git a/OpenSim/Framework/ForeignUserProfileData.cs b/OpenSim/Framework/ForeignUserProfileData.cs
index bcb4243..4f734a7 100644
--- a/OpenSim/Framework/ForeignUserProfileData.cs
+++ b/OpenSim/Framework/ForeignUserProfileData.cs
@@ -1,80 +1,80 @@
-/**
+/**
- * Copyright (c) 2008, Contributors. All rights reserved.
+ * Copyright (c) 2008, Contributors. All rights reserved.
- * 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 modification, 
+ * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
+ * are permitted provided that the following conditions are met:
- * 
+ * 
- *     * Redistributions of source code must retain the above copyright notice, 
+ *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
+ *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
+ *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
+ *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
+ *       and/or other materials provided with the distribution.
- *     * Neither the name of the Organizations nor the names of Individual
+ *     * Neither the name of the Organizations nor the names of Individual
- *       Contributors may be used to endorse or promote products derived from 
+ *       Contributors may be used to endorse or promote products derived from 
- *       this software without specific prior written permission.
+ *       this software without specific prior written permission.
- * 
+ * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+ * 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 
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
- * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
+ * 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 
+ * 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 
+ * 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 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ * 
- */
+ */
-using System;
+using System;
-using OpenSim.Framework;
+using OpenSim.Framework;
-namespace OpenSim.Framework
+namespace OpenSim.Framework
-{
+{
-    public class ForeignUserProfileData : UserProfileData
+    public class ForeignUserProfileData : UserProfileData
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// The address of the users home sim, used for foreigners.
+        /// The address of the users home sim, used for foreigners.
-        /// </summary>
+        /// </summary>
-        private string _userUserServerURI = String.Empty;
+        private string _userUserServerURI = String.Empty;
-        /// <summary>
+        /// <summary>
-        /// The address of the users home sim, used for foreigners.
+        /// The address of the users home sim, used for foreigners.
-        /// </summary>
+        /// </summary>
-        private string _userHomeAddress = String.Empty;
+        private string _userHomeAddress = String.Empty;
-        /// <summary>
+        /// <summary>
-        /// The port of the users home sim, used for foreigners.
+        /// The port of the users home sim, used for foreigners.
-        /// </summary>
+        /// </summary>
-        private string _userHomePort = String.Empty;
+        private string _userHomePort = String.Empty;
-        /// <summary>
+        /// <summary>
-        /// The remoting port of the users home sim, used for foreigners.
+        /// The remoting port of the users home sim, used for foreigners.
-        /// </summary>
+        /// </summary>
-        private string _userHomeRemotingPort = String.Empty;
+        private string _userHomeRemotingPort = String.Empty;
-        public string UserServerURI
+        public string UserServerURI
-        {
+        {
-            get { return _userUserServerURI; }
+            get { return _userUserServerURI; }
-            set { _userUserServerURI = value; }
+            set { _userUserServerURI = value; }
-        }
+        }
-        public string UserHomeAddress
+        public string UserHomeAddress
-        {
+        {
-            get { return _userHomeAddress; }
+            get { return _userHomeAddress; }
-            set { _userHomeAddress = value; }
+            set { _userHomeAddress = value; }
-        }
+        }
-        public string UserHomePort
+        public string UserHomePort
-        {
+        {
-            get { return _userHomePort; }
+            get { return _userHomePort; }
-            set { _userHomePort = value; }
+            set { _userHomePort = value; }
-        }
+        }
-        public string UserHomeRemotingPort
+        public string UserHomeRemotingPort
-        {
+        {
-            get { return _userHomeRemotingPort; }
+            get { return _userHomeRemotingPort; }
-            set { _userHomeRemotingPort = value; }
+            set { _userHomeRemotingPort = value; }
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Framework/HGNetworkServersInfo.cs b/OpenSim/Framework/HGNetworkServersInfo.cs
index 5b19801..b9bc07a 100644
--- a/OpenSim/Framework/HGNetworkServersInfo.cs
+++ b/OpenSim/Framework/HGNetworkServersInfo.cs
@@ -1,90 +1,90 @@
-/**
+/**
- * Copyright (c) 2008, Contributors. All rights reserved.
+ * Copyright (c) 2008, Contributors. All rights reserved.
- * 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 modification, 
+ * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
+ * are permitted provided that the following conditions are met:
- * 
+ * 
- *     * Redistributions of source code must retain the above copyright notice, 
+ *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
+ *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
+ *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
+ *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
+ *       and/or other materials provided with the distribution.
- *     * Neither the name of the Organizations nor the names of Individual
+ *     * Neither the name of the Organizations nor the names of Individual
- *       Contributors may be used to endorse or promote products derived from 
+ *       Contributors may be used to endorse or promote products derived from 
- *       this software without specific prior written permission.
+ *       this software without specific prior written permission.
- * 
+ * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+ * 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 
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
- * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
+ * 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 
+ * 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 
+ * 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 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ * 
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Net;
+using System.Net;
-using OpenSim.Framework;
+using OpenSim.Framework;
-namespace OpenSim.Framework
+namespace OpenSim.Framework
-{
+{
-    public class HGNetworkServersInfo
+    public class HGNetworkServersInfo
-    {
+    {
-        public readonly string LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI;
+        public readonly string LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI;
-        private static HGNetworkServersInfo m_singleton;
+        private static HGNetworkServersInfo m_singleton;
-        public static HGNetworkServersInfo Singleton
+        public static HGNetworkServersInfo Singleton
-        {
+        {
-            get { return m_singleton; }
+            get { return m_singleton; }
-        }
+        }
-        public static void Init(string assetserver, string inventoryserver, string userserver)
+        public static void Init(string assetserver, string inventoryserver, string userserver)
-        {
+        {
-            m_singleton = new HGNetworkServersInfo(assetserver, inventoryserver, userserver);
+            m_singleton = new HGNetworkServersInfo(assetserver, inventoryserver, userserver);
-        }
+        }
-        private HGNetworkServersInfo(string a, string i, string u)
+        private HGNetworkServersInfo(string a, string i, string u)
-        {
+        {
-            LocalAssetServerURI = ServerURI(a);
+            LocalAssetServerURI = ServerURI(a);
-            LocalInventoryServerURI = ServerURI(i);
+            LocalInventoryServerURI = ServerURI(i);
-            LocalUserServerURI = ServerURI(u);
+            LocalUserServerURI = ServerURI(u);
-        }
+        }
-        public bool IsLocalUser(string userserver)
+        public bool IsLocalUser(string userserver)
-        {
+        {
-            string userServerURI = ServerURI(userserver);
+            string userServerURI = ServerURI(userserver);
-            bool ret = (((userServerURI == null) || (userServerURI == "") || (userServerURI == LocalUserServerURI)));
+            bool ret = (((userServerURI == null) || (userServerURI == "") || (userServerURI == LocalUserServerURI)));
-            //Console.WriteLine("-------------> HGNetworkServersInfo.IsLocalUser? " + ret + "(userServer=" + userServerURI + "; localuserserver=" + LocalUserServerURI + ")");
+            //Console.WriteLine("-------------> HGNetworkServersInfo.IsLocalUser? " + ret + "(userServer=" + userServerURI + "; localuserserver=" + LocalUserServerURI + ")");
-            return ret;
+            return ret;
-        }
+        }
-        public static string ServerURI(string uri)
+        public static string ServerURI(string uri)
-        {
+        {
-            IPAddress ipaddr1 = null;
+            IPAddress ipaddr1 = null;
-            string port1 = "";
+            string port1 = "";
-            try
+            try
-            {
+            {
-                ipaddr1 = Util.GetHostFromURL(uri);
+                ipaddr1 = Util.GetHostFromURL(uri);
-            }
+            }
-            catch { }
+            catch { }
-            try
+            try
-            {
+            {
-                port1 = uri.Split(new char[] { ':' })[2];
+                port1 = uri.Split(new char[] { ':' })[2];
-            }
+            }
-            catch { }
+            catch { }
-            // We tried our best to convert the domain names to IP addresses
+            // We tried our best to convert the domain names to IP addresses
-            return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri;
+            return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri;
-        }
+        }
-    }
+    }
-}
+}
author	Jeff Ames	2008-11-25 16:00:55 +0000
committer	Jeff Ames	2008-11-25 16:00:55 +0000
commit	518a8b9f2ac09a5060e2e59c913dfbe7faf397ef (patch)
tree	8b3e39fbd54452e031873d31ff099e7db064cdee /OpenSim/Framework
parent	* minor: eliminate mono compiler warnings (diff)
download	opensim-SC_OLD-518a8b9f2ac09a5060e2e59c913dfbe7faf397ef.zip opensim-SC_OLD-518a8b9f2ac09a5060e2e59c913dfbe7faf397ef.tar.gz opensim-SC_OLD-518a8b9f2ac09a5060e2e59c913dfbe7faf397ef.tar.bz2 opensim-SC_OLD-518a8b9f2ac09a5060e2e59c913dfbe7faf397ef.tar.xz

diff --git a/OpenSim/Framework/Communications/IHyperlink.cs b/OpenSim/Framework/Communications/IHyperlink.cs index 77815f1..02ba2c2 100644 --- a/OpenSim/Framework/Communications/IHyperlink.cs +++ b/OpenSim/Framework/Communications/IHyperlink.cs
@@ -1,42 +1,42 @@
1	/**	1	/**
2	* Copyright (c) 2008, Contributors. All rights reserved.	2	* Copyright (c) 2008, Contributors. All rights reserved.
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 modification,	5	* Redistribution and use in source and binary forms, with or without modification,
6	* are permitted provided that the following conditions are met:	6	* are permitted provided that the following conditions are met:
7	*	7	*
8	* * Redistributions of source code must retain the above copyright notice,	8	* * Redistributions of source code must retain the above copyright notice,
9	* this list of conditions and the following disclaimer.	9	* this list of conditions and the following disclaimer.
10	* * Redistributions in binary form must reproduce the above copyright notice,	10	* * Redistributions in binary form must reproduce the above copyright notice,
11	* this list of conditions and the following disclaimer in the documentation	11	* this list of conditions and the following disclaimer in the documentation
12	* and/or other materials provided with the distribution.	12	* and/or other materials provided with the distribution.
13	* * Neither the name of the Organizations nor the names of Individual	13	* * Neither the name of the Organizations nor the names of Individual
14	* Contributors may be used to endorse or promote products derived from	14	* Contributors may be used to endorse or promote products derived from
15	* this software without specific prior written permission.	15	* this software without specific prior written permission.
16	*	16	*
17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND	17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	18	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL	19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
20	* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,	20	* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
21	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE	21	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
22	* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED	22	* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23	* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING	23	* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
24	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	24	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
25	* OF THE POSSIBILITY OF SUCH DAMAGE.	25	* OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28	using System;	28	using System;
29	using System.Collections.Generic;	29	using System.Collections.Generic;
30	using System.Text;	30	using System.Text;
31		31
32	using OpenSim.Framework;	32	using OpenSim.Framework;
33		33
34	namespace OpenSim.Framework.Communications	34	namespace OpenSim.Framework.Communications
35	{	35	{
36	public interface IHyperlink	36	public interface IHyperlink
37	{	37	{
38	bool IsHyperlinkRegion(ulong handle);	38	bool IsHyperlinkRegion(ulong handle);
39	RegionInfo GetHyperlinkRegion(ulong handle);	39	RegionInfo GetHyperlinkRegion(ulong handle);
40	ulong FindRegionHandle(ulong handle);	40	ulong FindRegionHandle(ulong handle);
41	}	41	}
42	}	42	}


diff --git a/OpenSim/Framework/ForeignUserProfileData.cs b/OpenSim/Framework/ForeignUserProfileData.cs index bcb4243..4f734a7 100644 --- a/OpenSim/Framework/ForeignUserProfileData.cs +++ b/OpenSim/Framework/ForeignUserProfileData.cs
@@ -1,80 +1,80 @@
1	/**	1	/**
2	* Copyright (c) 2008, Contributors. All rights reserved.	2	* Copyright (c) 2008, Contributors. All rights reserved.
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 modification,	5	* Redistribution and use in source and binary forms, with or without modification,
6	* are permitted provided that the following conditions are met:	6	* are permitted provided that the following conditions are met:
7	*	7	*
8	* * Redistributions of source code must retain the above copyright notice,	8	* * Redistributions of source code must retain the above copyright notice,
9	* this list of conditions and the following disclaimer.	9	* this list of conditions and the following disclaimer.
10	* * Redistributions in binary form must reproduce the above copyright notice,	10	* * Redistributions in binary form must reproduce the above copyright notice,
11	* this list of conditions and the following disclaimer in the documentation	11	* this list of conditions and the following disclaimer in the documentation
12	* and/or other materials provided with the distribution.	12	* and/or other materials provided with the distribution.
13	* * Neither the name of the Organizations nor the names of Individual	13	* * Neither the name of the Organizations nor the names of Individual
14	* Contributors may be used to endorse or promote products derived from	14	* Contributors may be used to endorse or promote products derived from
15	* this software without specific prior written permission.	15	* this software without specific prior written permission.
16	*	16	*
17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND	17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	18	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL	19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
20	* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,	20	* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
21	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE	21	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
22	* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED	22	* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23	* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING	23	* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
24	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	24	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
25	* OF THE POSSIBILITY OF SUCH DAMAGE.	25	* OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28		28
29	using System;	29	using System;
30		30
31	using OpenSim.Framework;	31	using OpenSim.Framework;
32		32
33	namespace OpenSim.Framework	33	namespace OpenSim.Framework
34	{	34	{
35	public class ForeignUserProfileData : UserProfileData	35	public class ForeignUserProfileData : UserProfileData
36	{	36	{
37	/// <summary>	37	/// <summary>
38	/// The address of the users home sim, used for foreigners.	38	/// The address of the users home sim, used for foreigners.
39	/// </summary>	39	/// </summary>
40	private string _userUserServerURI = String.Empty;	40	private string _userUserServerURI = String.Empty;
41		41
42	/// <summary>	42	/// <summary>
43	/// The address of the users home sim, used for foreigners.	43	/// The address of the users home sim, used for foreigners.
44	/// </summary>	44	/// </summary>
45	private string _userHomeAddress = String.Empty;	45	private string _userHomeAddress = String.Empty;
46		46
47	/// <summary>	47	/// <summary>
48	/// The port of the users home sim, used for foreigners.	48	/// The port of the users home sim, used for foreigners.
49	/// </summary>	49	/// </summary>
50	private string _userHomePort = String.Empty;	50	private string _userHomePort = String.Empty;
51	/// <summary>	51	/// <summary>
52	/// The remoting port of the users home sim, used for foreigners.	52	/// The remoting port of the users home sim, used for foreigners.
53	/// </summary>	53	/// </summary>
54	private string _userHomeRemotingPort = String.Empty;	54	private string _userHomeRemotingPort = String.Empty;
55		55
56	public string UserServerURI	56	public string UserServerURI
57	{	57	{
58	get { return _userUserServerURI; }	58	get { return _userUserServerURI; }
59	set { _userUserServerURI = value; }	59	set { _userUserServerURI = value; }
60	}	60	}
61		61
62	public string UserHomeAddress	62	public string UserHomeAddress
63	{	63	{
64	get { return _userHomeAddress; }	64	get { return _userHomeAddress; }
65	set { _userHomeAddress = value; }	65	set { _userHomeAddress = value; }
66	}	66	}
67		67
68	public string UserHomePort	68	public string UserHomePort
69	{	69	{
70	get { return _userHomePort; }	70	get { return _userHomePort; }
71	set { _userHomePort = value; }	71	set { _userHomePort = value; }
72	}	72	}
73		73
74	public string UserHomeRemotingPort	74	public string UserHomeRemotingPort
75	{	75	{
76	get { return _userHomeRemotingPort; }	76	get { return _userHomeRemotingPort; }
77	set { _userHomeRemotingPort = value; }	77	set { _userHomeRemotingPort = value; }
78	}	78	}
79	}	79	}
80	}	80	}


diff --git a/OpenSim/Framework/HGNetworkServersInfo.cs b/OpenSim/Framework/HGNetworkServersInfo.cs index 5b19801..b9bc07a 100644 --- a/OpenSim/Framework/HGNetworkServersInfo.cs +++ b/OpenSim/Framework/HGNetworkServersInfo.cs
@@ -1,90 +1,90 @@
1	/**	1	/**
2	* Copyright (c) 2008, Contributors. All rights reserved.	2	* Copyright (c) 2008, Contributors. All rights reserved.
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 modification,	5	* Redistribution and use in source and binary forms, with or without modification,
6	* are permitted provided that the following conditions are met:	6	* are permitted provided that the following conditions are met:
7	*	7	*
8	* * Redistributions of source code must retain the above copyright notice,	8	* * Redistributions of source code must retain the above copyright notice,
9	* this list of conditions and the following disclaimer.	9	* this list of conditions and the following disclaimer.
10	* * Redistributions in binary form must reproduce the above copyright notice,	10	* * Redistributions in binary form must reproduce the above copyright notice,
11	* this list of conditions and the following disclaimer in the documentation	11	* this list of conditions and the following disclaimer in the documentation
12	* and/or other materials provided with the distribution.	12	* and/or other materials provided with the distribution.
13	* * Neither the name of the Organizations nor the names of Individual	13	* * Neither the name of the Organizations nor the names of Individual
14	* Contributors may be used to endorse or promote products derived from	14	* Contributors may be used to endorse or promote products derived from
15	* this software without specific prior written permission.	15	* this software without specific prior written permission.
16	*	16	*
17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND	17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	18	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL	19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
20	* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,	20	* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
21	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE	21	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
22	* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED	22	* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23	* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING	23	* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
24	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	24	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
25	* OF THE POSSIBILITY OF SUCH DAMAGE.	25	* OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28		28
29	using System;	29	using System;
30	using System.Collections.Generic;	30	using System.Collections.Generic;
31	using System.Net;	31	using System.Net;
32		32
33	using OpenSim.Framework;	33	using OpenSim.Framework;
34		34
35	namespace OpenSim.Framework	35	namespace OpenSim.Framework
36	{	36	{
37	public class HGNetworkServersInfo	37	public class HGNetworkServersInfo
38	{	38	{
39		39
40	public readonly string LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI;	40	public readonly string LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI;
41		41
42	private static HGNetworkServersInfo m_singleton;	42	private static HGNetworkServersInfo m_singleton;
43	public static HGNetworkServersInfo Singleton	43	public static HGNetworkServersInfo Singleton
44	{	44	{
45	get { return m_singleton; }	45	get { return m_singleton; }
46	}	46	}
47		47
48	public static void Init(string assetserver, string inventoryserver, string userserver)	48	public static void Init(string assetserver, string inventoryserver, string userserver)
49	{	49	{
50	m_singleton = new HGNetworkServersInfo(assetserver, inventoryserver, userserver);	50	m_singleton = new HGNetworkServersInfo(assetserver, inventoryserver, userserver);
51		51
52	}	52	}
53		53
54	private HGNetworkServersInfo(string a, string i, string u)	54	private HGNetworkServersInfo(string a, string i, string u)
55	{	55	{
56	LocalAssetServerURI = ServerURI(a);	56	LocalAssetServerURI = ServerURI(a);
57	LocalInventoryServerURI = ServerURI(i);	57	LocalInventoryServerURI = ServerURI(i);
58	LocalUserServerURI = ServerURI(u);	58	LocalUserServerURI = ServerURI(u);
59	}	59	}
60		60
61	public bool IsLocalUser(string userserver)	61	public bool IsLocalUser(string userserver)
62	{	62	{
63	string userServerURI = ServerURI(userserver);	63	string userServerURI = ServerURI(userserver);
64	bool ret = (((userServerURI == null) \|\| (userServerURI == "") \|\| (userServerURI == LocalUserServerURI)));	64	bool ret = (((userServerURI == null) \|\| (userServerURI == "") \|\| (userServerURI == LocalUserServerURI)));
65	//Console.WriteLine("-------------> HGNetworkServersInfo.IsLocalUser? " + ret + "(userServer=" + userServerURI + "; localuserserver=" + LocalUserServerURI + ")");	65	//Console.WriteLine("-------------> HGNetworkServersInfo.IsLocalUser? " + ret + "(userServer=" + userServerURI + "; localuserserver=" + LocalUserServerURI + ")");
66	return ret;	66	return ret;
67	}	67	}
68		68
69	public static string ServerURI(string uri)	69	public static string ServerURI(string uri)
70	{	70	{
71	IPAddress ipaddr1 = null;	71	IPAddress ipaddr1 = null;
72	string port1 = "";	72	string port1 = "";
73	try	73	try
74	{	74	{
75	ipaddr1 = Util.GetHostFromURL(uri);	75	ipaddr1 = Util.GetHostFromURL(uri);
76	}	76	}
77	catch { }	77	catch { }
78		78
79	try	79	try
80	{	80	{
81	port1 = uri.Split(new char[] { ':' })[2];	81	port1 = uri.Split(new char[] { ':' })[2];
82	}	82	}
83	catch { }	83	catch { }
84		84
85	// We tried our best to convert the domain names to IP addresses	85	// We tried our best to convert the domain names to IP addresses
86	return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri;	86	return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri;
87	}	87	}
88		88
89	}	89	}
90	}	90	}