as per the "Filesystem cleanup for OpenSim repository" mailing list thread. Have flattened the OpenSim.Framework project/namespace. The problem is that the namespace is still wrong as its "OpenSim.Framework" while the directory is "OpenSim\Framework\General" , so we need to decide if we change the directory or correct the namespace.

Note this has lead to a big flat project, but I think a lot of the files we most likely don't even use any longer. And others belong in other projects/namespaces anyway.
author: MW 2007-10-29 21:46:25 +0000
committer: MW 2007-10-29 21:46:25 +0000
commit: 3d8219f6c7faa256d6a13ab7925f75d83af95b78 (patch)
tree: ea507efa88aa7e526575469a6ce913fdc0c0358e /OpenSim/Framework/General/NetworkServersInfo.cs
parent: Fixed a bug in SQLAssetServer that only seemed to be a problem when running u... (diff)
download: opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.zip
opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.gz
opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.bz2
opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.xz
1 files changed, 94 insertions, 94 deletions
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/NetworkServersInfo.cs
index 2357a9e..358e496 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/NetworkServersInfo.cs
@@ -1,94 +1,94 @@
-/*
+/*
-* Copyright (c) Contributors, http://opensimulator.org/
+* Copyright (c) Contributors, http://opensimulator.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 System;
+using System;
-using OpenSim.Framework.Console;
+using OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
-using Nini.Config;
+using Nini.Config;
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
-{
+{
-    public class NetworkServersInfo
+    public class NetworkServersInfo
-    {
+    {
-        public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
+        public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
-        public string AssetSendKey = "";
+        public string AssetSendKey = "";
-        public string GridURL = "";
+        public string GridURL = "";
-        public string GridSendKey = "";
+        public string GridSendKey = "";
-        public string GridRecvKey = "";
+        public string GridRecvKey = "";
-        public string UserURL = "";
+        public string UserURL = "";
-        public string UserSendKey = "";
+        public string UserSendKey = "";
-        public string UserRecvKey = "";
+        public string UserRecvKey = "";
-        public bool isSandbox;
+        public bool isSandbox;
-        public static int DefaultHttpListenerPort = 9000;
+        public static int DefaultHttpListenerPort = 9000;
-        public int HttpListenerPort = DefaultHttpListenerPort;
+        public int HttpListenerPort = DefaultHttpListenerPort;
-        public static int RemotingListenerPort = 8895;
+        public static int RemotingListenerPort = 8895;
-        public NetworkServersInfo()
+        public NetworkServersInfo()
-        {
+        {
-        }
+        }
-        public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY)
+        public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY)
-        {
+        {
-            m_defaultHomeLocX = defaultHomeLocX;
+            m_defaultHomeLocX = defaultHomeLocX;
-            m_defaultHomeLocY = defaultHomeLocY;
+            m_defaultHomeLocY = defaultHomeLocY;
-        }
+        }
-        private uint? m_defaultHomeLocX;
+        private uint? m_defaultHomeLocX;
-        public uint DefaultHomeLocX
+        public uint DefaultHomeLocX
-        {
+        {
-            get { return m_defaultHomeLocX.Value; }
+            get { return m_defaultHomeLocX.Value; }
-        }
+        }
-        private uint? m_defaultHomeLocY;
+        private uint? m_defaultHomeLocY;
-        public uint DefaultHomeLocY
+        public uint DefaultHomeLocY
-        {
+        {
-            get { return m_defaultHomeLocY.Value; }
+            get { return m_defaultHomeLocY.Value; }
-        }
+        }
-        public void loadFromConfiguration(IConfigSource config)
+        public void loadFromConfiguration(IConfigSource config)
-        {
+        {
-            m_defaultHomeLocX = (uint)config.Configs["StandAlone"].GetInt("default_location_x", 1000);
+            m_defaultHomeLocX = (uint)config.Configs["StandAlone"].GetInt("default_location_x", 1000);
-            m_defaultHomeLocY = (uint)config.Configs["StandAlone"].GetInt("default_location_y", 1000);
+            m_defaultHomeLocY = (uint)config.Configs["StandAlone"].GetInt("default_location_y", 1000);
-            HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort);
+            HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort);
-            RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort);
+            RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort);
-            GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
+            GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
-            GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");
+            GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");
-            GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");
+            GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");
-            UserURL = config.Configs["Network"].GetString("user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
+            UserURL = config.Configs["Network"].GetString("user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
-            UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
+            UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
-            UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
+            UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
-            AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
+            AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
-        }
+        }
-    }
+    }
-}
+}
author	MW	2007-10-29 21:46:25 +0000
committer	MW	2007-10-29 21:46:25 +0000
commit	3d8219f6c7faa256d6a13ab7925f75d83af95b78 (patch)
tree	ea507efa88aa7e526575469a6ce913fdc0c0358e /OpenSim/Framework/General/NetworkServersInfo.cs
parent	Fixed a bug in SQLAssetServer that only seemed to be a problem when running u... (diff)
download	opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.zip opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.gz opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.bz2 opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.xz

diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/NetworkServersInfo.cs index 2357a9e..358e496 100644 --- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs +++ b/OpenSim/Framework/General/NetworkServersInfo.cs
@@ -1,94 +1,94 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.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 System;	28	using System;
29	using OpenSim.Framework.Console;	29	using OpenSim.Framework.Console;
30	using OpenSim.Framework.Interfaces;	30	using OpenSim.Framework.Interfaces;
31	using OpenSim.Framework.Configuration;	31	using OpenSim.Framework;
32		32
33	using Nini.Config;	33	using Nini.Config;
34	namespace OpenSim.Framework.Types	34	namespace OpenSim.Framework
35	{	35	{
36	public class NetworkServersInfo	36	public class NetworkServersInfo
37	{	37	{
38	public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";	38	public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
39	public string AssetSendKey = "";	39	public string AssetSendKey = "";
40		40
41	public string GridURL = "";	41	public string GridURL = "";
42	public string GridSendKey = "";	42	public string GridSendKey = "";
43	public string GridRecvKey = "";	43	public string GridRecvKey = "";
44	public string UserURL = "";	44	public string UserURL = "";
45	public string UserSendKey = "";	45	public string UserSendKey = "";
46	public string UserRecvKey = "";	46	public string UserRecvKey = "";
47	public bool isSandbox;	47	public bool isSandbox;
48		48
49	public static int DefaultHttpListenerPort = 9000;	49	public static int DefaultHttpListenerPort = 9000;
50	public int HttpListenerPort = DefaultHttpListenerPort;	50	public int HttpListenerPort = DefaultHttpListenerPort;
51		51
52	public static int RemotingListenerPort = 8895;	52	public static int RemotingListenerPort = 8895;
53		53
54		54
55	public NetworkServersInfo()	55	public NetworkServersInfo()
56	{	56	{
57	}	57	}
58		58
59	public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY)	59	public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY)
60	{	60	{
61	m_defaultHomeLocX = defaultHomeLocX;	61	m_defaultHomeLocX = defaultHomeLocX;
62	m_defaultHomeLocY = defaultHomeLocY;	62	m_defaultHomeLocY = defaultHomeLocY;
63	}	63	}
64		64
65	private uint? m_defaultHomeLocX;	65	private uint? m_defaultHomeLocX;
66	public uint DefaultHomeLocX	66	public uint DefaultHomeLocX
67	{	67	{
68	get { return m_defaultHomeLocX.Value; }	68	get { return m_defaultHomeLocX.Value; }
69	}	69	}
70		70
71	private uint? m_defaultHomeLocY;	71	private uint? m_defaultHomeLocY;
72	public uint DefaultHomeLocY	72	public uint DefaultHomeLocY
73	{	73	{
74	get { return m_defaultHomeLocY.Value; }	74	get { return m_defaultHomeLocY.Value; }
75	}	75	}
76		76
77	public void loadFromConfiguration(IConfigSource config)	77	public void loadFromConfiguration(IConfigSource config)
78	{	78	{
79	m_defaultHomeLocX = (uint)config.Configs["StandAlone"].GetInt("default_location_x", 1000);	79	m_defaultHomeLocX = (uint)config.Configs["StandAlone"].GetInt("default_location_x", 1000);
80	m_defaultHomeLocY = (uint)config.Configs["StandAlone"].GetInt("default_location_y", 1000);	80	m_defaultHomeLocY = (uint)config.Configs["StandAlone"].GetInt("default_location_y", 1000);
81		81
82	HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort);	82	HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort);
83	RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort);	83	RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort);
84	GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());	84	GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
85	GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");	85	GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");
86	GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");	86	GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");
87	UserURL = config.Configs["Network"].GetString("user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());	87	UserURL = config.Configs["Network"].GetString("user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
88	UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");	88	UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
89	UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");	89	UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
90	AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);	90	AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
91		91
92	}	92	}
93	}	93	}
94	}	94	}