From 064404ab409ddd0a3b25027a98582696295c46fd Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Wed, 31 Oct 2007 07:28:23 +0000
Subject: * Moved OpenSim/Framework/General to OpenSim/Framework for great
 justice.

---
 OpenSim/Framework/NetworkServersInfo.cs | 100 ++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 OpenSim/Framework/NetworkServersInfo.cs

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
new file mode 100644
index 0000000..b9ce143
--- /dev/null
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -0,0 +1,100 @@
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* 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 OpenSim 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.
+* 
+*/
+
+using Nini.Config;
+
+namespace OpenSim.Framework
+{
+    public class NetworkServersInfo
+    {
+        public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
+        public string AssetSendKey = "";
+
+        public string GridURL = "";
+        public string GridSendKey = "";
+        public string GridRecvKey = "";
+        public string UserURL = "";
+        public string UserSendKey = "";
+        public string UserRecvKey = "";
+        public bool isSandbox;
+
+        public string InventoryURL = "";
+
+        public static int DefaultHttpListenerPort = 9000;
+        public int HttpListenerPort = DefaultHttpListenerPort;
+
+        public static int RemotingListenerPort = 8895;
+
+
+        public NetworkServersInfo()
+        {
+        }
+
+        public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY)
+        {
+            m_defaultHomeLocX = defaultHomeLocX;
+            m_defaultHomeLocY = defaultHomeLocY;
+        }
+
+        private uint? m_defaultHomeLocX;
+
+        public uint DefaultHomeLocX
+        {
+            get { return m_defaultHomeLocX.Value; }
+        }
+
+        private uint? m_defaultHomeLocY;
+
+        public uint DefaultHomeLocY
+        {
+            get { return m_defaultHomeLocY.Value; }
+        }
+
+        public void loadFromConfiguration(IConfigSource config)
+        {
+            m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000);
+            m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
+
+            HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort);
+            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());
+            GridSendKey = config.Configs["Network"].GetString("grid_send_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());
+            UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
+            UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
+            AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
+            InventoryURL = config.Configs["Network"].GetString("inventory_server_url",
+                                                    "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
+        }
+    }
+}
-- 
cgit v1.1


From 4fad66f855544b9298ae2216c58c0f44009358a5 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 1 Nov 2007 19:19:05 +0000
Subject: * Diuerse beavtificatems

---
 OpenSim/Framework/NetworkServersInfo.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index b9ce143..1c76320 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -94,7 +94,8 @@ namespace OpenSim.Framework
             UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
             AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
             InventoryURL = config.Configs["Network"].GetString("inventory_server_url",
-                                                    "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
+                                                               "http://127.0.0.1:" +
+                                                               InventoryConfig.DefaultHttpPort.ToString());
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From 4bde56457f574060c1aaaca8effba1f6fe00b6c7 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 6 Dec 2007 01:41:41 +0000
Subject: removed some duplicate hard-coded port numbers.  changed ports to
 uint.

---
 OpenSim/Framework/NetworkServersInfo.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 1c76320..b3e79b7 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -45,10 +45,10 @@ namespace OpenSim.Framework
 
         public string InventoryURL = "";
 
-        public static int DefaultHttpListenerPort = 9000;
-        public int HttpListenerPort = DefaultHttpListenerPort;
+        public static uint DefaultHttpListenerPort = 9000;
+        public uint HttpListenerPort = DefaultHttpListenerPort;
 
-        public static int RemotingListenerPort = 8895;
+        public static uint RemotingListenerPort = 8895;
 
 
         public NetworkServersInfo()
@@ -80,8 +80,8 @@ namespace OpenSim.Framework
             m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000);
             m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
 
-            HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort);
-            RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort);
+            HttpListenerPort = (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultHttpListenerPort);
+            RemotingListenerPort = (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
             GridURL =
                 config.Configs["Network"].GetString("grid_server_url",
                                                     "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
-- 
cgit v1.1


From af6eb67999875f12270ef19ed33c179556696754 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 10 Dec 2007 05:25:16 +0000
Subject: saved OpenSim source code from the giant rampaging unterminated
 copyright notice of doom

---
 OpenSim/Framework/NetworkServersInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index b3e79b7..6f8ff7d 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -13,7 +13,7 @@
 *       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
+* 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
@@ -98,4 +98,4 @@ namespace OpenSim.Framework
                                                                InventoryConfig.DefaultHttpPort.ToString());
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1


From efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 27 Dec 2007 21:41:48 +0000
Subject: * Optimized usings * shortened references * Removed redundant 'this'
 * Normalized EOF

---
 OpenSim/Framework/NetworkServersInfo.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 6f8ff7d..cf1457d 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -80,8 +80,10 @@ namespace OpenSim.Framework
             m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000);
             m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
 
-            HttpListenerPort = (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultHttpListenerPort);
-            RemotingListenerPort = (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
+            HttpListenerPort =
+                (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultHttpListenerPort);
+            RemotingListenerPort =
+                (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
             GridURL =
                 config.Configs["Network"].GetString("grid_server_url",
                                                     "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
@@ -98,4 +100,4 @@ namespace OpenSim.Framework
                                                                InventoryConfig.DefaultHttpPort.ToString());
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From b25f9f322cdbcde7fd8c043137bf07992e5ef318 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Tue, 15 Jan 2008 02:09:55 +0000
Subject: * Mother of all commits: * Cleaned up copyright notices in
 AssemblyInfo.cs's * Added Copyright headers to a bunch of files missing them
 * Replaced several common string instances with a static constant to prevent
 reallocation of the same strings thousands of times. "" -> String.Empty is
 the first such candidate.

---
 OpenSim/Framework/NetworkServersInfo.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index cf1457d..c67a6bf 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -27,23 +27,24 @@
 */
 
 using Nini.Config;
+using System;
 
 namespace OpenSim.Framework
 {
     public class NetworkServersInfo
     {
         public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
-        public string AssetSendKey = "";
+        public string AssetSendKey = String.Empty;
 
-        public string GridURL = "";
-        public string GridSendKey = "";
-        public string GridRecvKey = "";
-        public string UserURL = "";
-        public string UserSendKey = "";
-        public string UserRecvKey = "";
+        public string GridURL = String.Empty;
+        public string GridSendKey = String.Empty;
+        public string GridRecvKey = String.Empty;
+        public string UserURL = String.Empty;
+        public string UserSendKey = String.Empty;
+        public string UserRecvKey = String.Empty;
         public bool isSandbox;
 
-        public string InventoryURL = "";
+        public string InventoryURL = String.Empty;
 
         public static uint DefaultHttpListenerPort = 9000;
         public uint HttpListenerPort = DefaultHttpListenerPort;
-- 
cgit v1.1


From 47180080f0f4b93c60232b47ca4e093bd7c73a1d Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Tue, 18 Mar 2008 05:16:43 +0000
Subject: Formatting cleanup.

---
 OpenSim/Framework/NetworkServersInfo.cs | 53 ++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 27 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index c67a6bf..20cd768 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -1,30 +1,29 @@
 /*
-* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* 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 OpenSim 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.
-* 
-*/
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * 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 OpenSim 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.
+ */
 
 using Nini.Config;
 using System;
@@ -101,4 +100,4 @@ namespace OpenSim.Framework
                                                                InventoryConfig.DefaultHttpPort.ToString());
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1


From da531fa9e124394228a7c7597bd50e548af81efb Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sun, 23 Mar 2008 21:21:39 +0000
Subject: * Start passing around a region server's http port in RegionInfo. *
 This means that caps methods (editing scripts, poss map functions, etc) on
 non-home regions should now work with servers which are listening for http
 ports on a non default (9000) port. * If you are running a region server,
 this may only work properly once your grid server upgrades to this revision *
 PLEASE NOTE: This shouldn't cause inter-region problems if one end of the
 connection hasn't upgraded to this revision.  However if it does, the
 instability will persist until the grid and region (and possibly all the
 region's neighbours) have upgraded to this revision. * This revision also
 adds extra login related messages, both for success and failure conditions

---
 OpenSim/Framework/NetworkServersInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 20cd768..df559fc 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Framework
 
         public string InventoryURL = String.Empty;
 
-        public static uint DefaultHttpListenerPort = 9000;
+        public static readonly uint DefaultHttpListenerPort = 9000;
         public uint HttpListenerPort = DefaultHttpListenerPort;
 
         public static uint RemotingListenerPort = 8895;
-- 
cgit v1.1


From fef3b3689492dea63693c964bcdbec9f5137eb5e Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Mon, 21 Apr 2008 07:09:17 +0000
Subject: * Optimised using statements and namespace references across entire
 project (this took a while to run).

---
 OpenSim/Framework/NetworkServersInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index df559fc..ee11924 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using Nini.Config;
 using System;
+using Nini.Config;
 
 namespace OpenSim.Framework
 {
-- 
cgit v1.1


From 375163a6fece8b3a57c7555246abe8338223a599 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Tue, 29 Apr 2008 14:04:55 +0000
Subject: * Spring cleaning. * Added new generic "Location" class to handle 2D
 integer locations. Going to use it to replace all RegionHandle and X,Y
 coordinate references throughout the entire project. You have been warned.

---
 OpenSim/Framework/NetworkServersInfo.cs | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index ee11924..399a365 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -32,23 +32,22 @@ namespace OpenSim.Framework
 {
     public class NetworkServersInfo
     {
-        public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
+        public static readonly uint DefaultHttpListenerPort = 9000;
+        public static uint RemotingListenerPort = 8895;
         public string AssetSendKey = String.Empty;
+        public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
 
-        public string GridURL = String.Empty;
-        public string GridSendKey = String.Empty;
         public string GridRecvKey = String.Empty;
-        public string UserURL = String.Empty;
-        public string UserSendKey = String.Empty;
-        public string UserRecvKey = String.Empty;
-        public bool isSandbox;
-
-        public string InventoryURL = String.Empty;
-
-        public static readonly uint DefaultHttpListenerPort = 9000;
+        public string GridSendKey = String.Empty;
+        public string GridURL = String.Empty;
         public uint HttpListenerPort = DefaultHttpListenerPort;
-
-        public static uint RemotingListenerPort = 8895;
+        public string InventoryURL = String.Empty;
+        public bool isSandbox;
+        private uint? m_defaultHomeLocX;
+        private uint? m_defaultHomeLocY;
+        public string UserRecvKey = String.Empty;
+        public string UserSendKey = String.Empty;
+        public string UserURL = String.Empty;
 
 
         public NetworkServersInfo()
@@ -61,15 +60,11 @@ namespace OpenSim.Framework
             m_defaultHomeLocY = defaultHomeLocY;
         }
 
-        private uint? m_defaultHomeLocX;
-
         public uint DefaultHomeLocX
         {
             get { return m_defaultHomeLocX.Value; }
         }
 
-        private uint? m_defaultHomeLocY;
-
         public uint DefaultHomeLocY
         {
             get { return m_defaultHomeLocY.Value; }
@@ -100,4 +95,4 @@ namespace OpenSim.Framework
                                                                InventoryConfig.DefaultHttpPort.ToString());
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From ce4bcb50655e69277eac64a6d3ab520d669e6b70 Mon Sep 17 00:00:00 2001
From: Johan Berntsson
Date: Wed, 23 Jul 2008 09:46:04 +0000
Subject: The new secure inventory server mode (in r5590) can now be disabled
 from OpenSim.ini. Default is to use the new mode.

---
 OpenSim/Framework/NetworkServersInfo.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 399a365..43ec11e 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -42,6 +42,7 @@ namespace OpenSim.Framework
         public string GridURL = String.Empty;
         public uint HttpListenerPort = DefaultHttpListenerPort;
         public string InventoryURL = String.Empty;
+        public bool secureInventoryServer = false;
         public bool isSandbox;
         private uint? m_defaultHomeLocX;
         private uint? m_defaultHomeLocY;
@@ -93,6 +94,7 @@ namespace OpenSim.Framework
             InventoryURL = config.Configs["Network"].GetString("inventory_server_url",
                                                                "http://127.0.0.1:" +
                                                                InventoryConfig.DefaultHttpPort.ToString());
+            secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1


From dbbbec48dfbc51f30953d8a46f4fc8f192bd277c Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sun, 14 Sep 2008 18:39:17 +0000
Subject: * This update makes configuring SSL a little easier on Windows XP. 
 It also makes it possible to run a HTTPS server on the region.   It also has
 a junk Certification authority for test purposes. * There are still a lot of
 things that are hard coded to use http.   They need to be fixed. * Also
 includes directions * A standard junk PEM file to append to
 app_settings/CA.pem in the client so SSL will work

---
 OpenSim/Framework/NetworkServersInfo.cs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 43ec11e..9f3014d 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -49,6 +49,9 @@ namespace OpenSim.Framework
         public string UserRecvKey = String.Empty;
         public string UserSendKey = String.Empty;
         public string UserURL = String.Empty;
+        public bool HttpUsesSSL = false;
+        public string HttpSSLCN = "";
+        public uint httpSSLPort = 9001;
 
 
         public NetworkServersInfo()
@@ -78,6 +81,10 @@ namespace OpenSim.Framework
 
             HttpListenerPort =
                 (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultHttpListenerPort);
+            httpSSLPort =
+                (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1));
+            HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
+            HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "");
             RemotingListenerPort =
                 (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
             GridURL =
-- 
cgit v1.1


From 38e8853e5761d09a7e8f580dd277d9b99b834696 Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Sat, 1 Nov 2008 22:09:48 +0000
Subject: Megapatch that fixes/adds: friend offer/deny/accept, friendship
 termination, on-/offline updates, calling cards for friends. This adds
 methods in the DB layer and changes the MessagingServer, so a full update
 (incl. UGAIM) is necessary to get it working. Older regions shouldn't break,
 nor should older UGAIM break newer regions, but friends/presence will only
 work with all concerned parts (UGAIM, source region and destination region)
 at this revision (or later). I added the DB code for MSSQL, too, but couldn't
 test that. BEWARE: May contain bugs.

---
 OpenSim/Framework/NetworkServersInfo.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 9f3014d..49b8ef9 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -53,6 +53,7 @@ namespace OpenSim.Framework
         public string HttpSSLCN = "";
         public uint httpSSLPort = 9001;
 
+        public string MessagingURL = String.Empty;
 
         public NetworkServersInfo()
         {
@@ -102,6 +103,9 @@ namespace OpenSim.Framework
                                                                "http://127.0.0.1:" +
                                                                InventoryConfig.DefaultHttpPort.ToString());
             secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
+
+            MessagingURL = config.Configs["Network"].GetString("messaging_server_url",
+                                                               "http://127.0.0.1:" + MessageServerConfig.DefaultHttpPort);
         }
     }
 }
-- 
cgit v1.1


From acad0328b2c50d22fe76ebb7c8de2c97c856b42f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 11 Mar 2009 18:02:22 +0000
Subject: * Make all coded defaults match settings in OpenSim.ini.example * In
 most cases, the setting in OpenSim.ini.example is taken as the canonical one
 since this is the file virtually everyone ends up using * OpenSim will start
 up with a blank OpenSim.ini, in which case sqlite is the default database (as
 before)

---
 OpenSim/Framework/NetworkServersInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 49b8ef9..23b1627 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework
     {
         public static readonly uint DefaultHttpListenerPort = 9000;
         public static uint RemotingListenerPort = 8895;
-        public string AssetSendKey = String.Empty;
+        public string AssetSendKey = String.Empty;        
         public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
 
         public string GridRecvKey = String.Empty;
@@ -85,7 +85,7 @@ namespace OpenSim.Framework
             httpSSLPort =
                 (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1));
             HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
-            HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "");
+            HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
             RemotingListenerPort =
                 (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
             GridURL =
-- 
cgit v1.1


From bbe1e196963fe8609a1070793b8439c293261d24 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 17 Apr 2009 05:52:46 +0000
Subject: * Some more work on refactoring configs;   * Moved the constants out
 into a separate DefaultConfig   * Pulled configMember up   * Some minor CCC

---
 OpenSim/Framework/NetworkServersInfo.cs | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 23b1627..11ea709 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -32,15 +32,13 @@ namespace OpenSim.Framework
 {
     public class NetworkServersInfo
     {
-        public static readonly uint DefaultHttpListenerPort = 9000;
-        public static uint RemotingListenerPort = 8895;
         public string AssetSendKey = String.Empty;        
-        public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
+        public string AssetURL = "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString() + "/";
 
         public string GridRecvKey = String.Empty;
         public string GridSendKey = String.Empty;
         public string GridURL = String.Empty;
-        public uint HttpListenerPort = DefaultHttpListenerPort;
+        public uint HttpListenerPort = DefaultSettings.DefaultRegionHttpPort;
         public string InventoryURL = String.Empty;
         public bool secureInventoryServer = false;
         public bool isSandbox;
@@ -81,31 +79,31 @@ namespace OpenSim.Framework
             m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
 
             HttpListenerPort =
-                (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultHttpListenerPort);
+                (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultSettings.DefaultRegionHttpPort);
             httpSSLPort =
-                (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1));
+                (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultSettings.DefaultRegionHttpPort+1));
             HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
             HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
-            RemotingListenerPort =
-                (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
+            DefaultSettings.DefaultRegionRemotingPort =
+                (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) DefaultSettings.DefaultRegionRemotingPort);
             GridURL =
                 config.Configs["Network"].GetString("grid_server_url",
-                                                    "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
+                                                    "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString());
             GridSendKey = config.Configs["Network"].GetString("grid_send_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());
+                                                    "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString());
             UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
             UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
             AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
             InventoryURL = config.Configs["Network"].GetString("inventory_server_url",
                                                                "http://127.0.0.1:" +
-                                                               InventoryConfig.DefaultHttpPort.ToString());
+                                                               DefaultSettings.DefaultInventoryServerHttpPort.ToString());
             secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
 
             MessagingURL = config.Configs["Network"].GetString("messaging_server_url",
-                                                               "http://127.0.0.1:" + MessageServerConfig.DefaultHttpPort);
+                                                               "http://127.0.0.1:" + DefaultSettings.DefaultMessageServerHttpPort);
         }
     }
 }
-- 
cgit v1.1


From a189da844a1ec48b321674f49a81c4e0a71c8b81 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 17 Apr 2009 15:09:37 +0000
Subject: * Moved the DefaultConfig settings into already-existing
 ConfigSettings

---
 OpenSim/Framework/NetworkServersInfo.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 11ea709..293602d 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -33,12 +33,12 @@ namespace OpenSim.Framework
     public class NetworkServersInfo
     {
         public string AssetSendKey = String.Empty;        
-        public string AssetURL = "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString() + "/";
+        public string AssetURL = "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/";
 
         public string GridRecvKey = String.Empty;
         public string GridSendKey = String.Empty;
         public string GridURL = String.Empty;
-        public uint HttpListenerPort = DefaultSettings.DefaultRegionHttpPort;
+        public uint HttpListenerPort = ConfigSettings.DefaultRegionHttpPort;
         public string InventoryURL = String.Empty;
         public bool secureInventoryServer = false;
         public bool isSandbox;
@@ -79,31 +79,31 @@ namespace OpenSim.Framework
             m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
 
             HttpListenerPort =
-                (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultSettings.DefaultRegionHttpPort);
+                (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort);
             httpSSLPort =
-                (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultSettings.DefaultRegionHttpPort+1));
+                (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1));
             HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
             HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
-            DefaultSettings.DefaultRegionRemotingPort =
-                (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) DefaultSettings.DefaultRegionRemotingPort);
+            ConfigSettings.DefaultRegionRemotingPort =
+                (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) ConfigSettings.DefaultRegionRemotingPort);
             GridURL =
                 config.Configs["Network"].GetString("grid_server_url",
-                                                    "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString());
+                                                    "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString());
             GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");
             GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");
             UserURL =
                 config.Configs["Network"].GetString("user_server_url",
-                                                    "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString());
+                                                    "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
             UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
             UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
             AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
             InventoryURL = config.Configs["Network"].GetString("inventory_server_url",
                                                                "http://127.0.0.1:" +
-                                                               DefaultSettings.DefaultInventoryServerHttpPort.ToString());
+                                                               ConfigSettings.DefaultInventoryServerHttpPort.ToString());
             secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
 
             MessagingURL = config.Configs["Network"].GetString("messaging_server_url",
-                                                               "http://127.0.0.1:" + DefaultSettings.DefaultMessageServerHttpPort);
+                                                               "http://127.0.0.1:" + ConfigSettings.DefaultMessageServerHttpPort);
         }
     }
 }
-- 
cgit v1.1


From 840de6c036570d559ec6924cd8405d3f34a99fdd Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 1 Jun 2009 06:37:14 +0000
Subject: Minor: Change OpenSim to OpenSimulator in older copyright headers and
 LICENSE.txt.

---
 OpenSim/Framework/NetworkServersInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 293602d..3b00af3 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -9,7 +9,7 @@
  *     * 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 OpenSim Project nor the
+ *     * 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.
  *
-- 
cgit v1.1


From 632bb7126277b6e8b524b76fb181a079b51adcf4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 26 Sep 2009 08:49:48 -0700
Subject: Fixed MapBlocks bug, wrong order of arguments. First version that
 seems completely functional. Also fixed the notification of the message
 server in standalone -- that server doesn't usually exist.

---
 OpenSim/Framework/NetworkServersInfo.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 3b00af3..7e66742 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -102,8 +102,7 @@ namespace OpenSim.Framework
                                                                ConfigSettings.DefaultInventoryServerHttpPort.ToString());
             secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
 
-            MessagingURL = config.Configs["Network"].GetString("messaging_server_url",
-                                                               "http://127.0.0.1:" + ConfigSettings.DefaultMessageServerHttpPort);
+            MessagingURL = config.Configs["Network"].GetString("messaging_server_url", string.Empty);
         }
     }
 }
-- 
cgit v1.1


From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 1 Oct 2009 01:00:09 +0900
Subject: Formatting cleanup.

---
 OpenSim/Framework/NetworkServersInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 7e66742..f720222 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
     public class NetworkServersInfo
     {
-        public string AssetSendKey = String.Empty;        
+        public string AssetSendKey = String.Empty;
         public string AssetURL = "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/";
 
         public string GridRecvKey = String.Empty;
-- 
cgit v1.1


From 041594ed075049f804fc157700a6d78e54194c0b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 31 Jan 2010 13:01:23 -0800
Subject: Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as
 well as lots of other obsolete configs.

---
 OpenSim/Framework/NetworkServersInfo.cs | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index f720222..b25f8b9 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -42,8 +42,6 @@ namespace OpenSim.Framework
         public string InventoryURL = String.Empty;
         public bool secureInventoryServer = false;
         public bool isSandbox;
-        private uint? m_defaultHomeLocX;
-        private uint? m_defaultHomeLocY;
         public string UserRecvKey = String.Empty;
         public string UserSendKey = String.Empty;
         public string UserURL = String.Empty;
@@ -59,24 +57,11 @@ namespace OpenSim.Framework
 
         public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY)
         {
-            m_defaultHomeLocX = defaultHomeLocX;
-            m_defaultHomeLocY = defaultHomeLocY;
         }
 
-        public uint DefaultHomeLocX
-        {
-            get { return m_defaultHomeLocX.Value; }
-        }
-
-        public uint DefaultHomeLocY
-        {
-            get { return m_defaultHomeLocY.Value; }
-        }
 
         public void loadFromConfiguration(IConfigSource config)
         {
-            m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000);
-            m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
 
             HttpListenerPort =
                 (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort);
@@ -84,8 +69,6 @@ namespace OpenSim.Framework
                 (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1));
             HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
             HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
-            ConfigSettings.DefaultRegionRemotingPort =
-                (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) ConfigSettings.DefaultRegionRemotingPort);
             GridURL =
                 config.Configs["Network"].GetString("grid_server_url",
                                                     "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString());
-- 
cgit v1.1


From 8ca793875318efc8db3339b25bf7fa5ddeeac218 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sun, 1 May 2011 14:44:09 -0400
Subject: Adding ssl support

	Adding ssl support for "Out of Band" applications such as the remote
	admin module or Robust services
---
 OpenSim/Framework/NetworkServersInfo.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index b25f8b9..5bb4111 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -49,6 +49,12 @@ namespace OpenSim.Framework
         public string HttpSSLCN = "";
         public uint httpSSLPort = 9001;
 
+        // "Out of band" managemnt https
+        public bool ssl_listener = false;
+        public uint https_port = 0;
+        public string cert_path = String.Empty;
+        public string cert_pass = String.Empty;
+
         public string MessagingURL = String.Empty;
 
         public NetworkServersInfo()
@@ -86,6 +92,15 @@ namespace OpenSim.Framework
             secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
 
             MessagingURL = config.Configs["Network"].GetString("messaging_server_url", string.Empty);
+
+            // "Out of band management https"
+            ssl_listener = config.Configs["Network"].GetBoolean("https_listener",false);
+            if( ssl_listener)
+            {
+                cert_path = config.Configs["Network"].GetString("cert_path",String.Empty);
+                cert_pass = config.Configs["Network"].GetString("cert_pass",String.Empty);
+                https_port = (uint)config.Configs["Network"].GetInt("https_port", 0);
+            }
         }
     }
 }
-- 
cgit v1.1


From 631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 12 Oct 2011 21:51:34 +0100
Subject: Get rid of some traces of the old pre-ROBUST grid architecture config

---
 OpenSim/Framework/NetworkServersInfo.cs | 31 -------------------------------
 1 file changed, 31 deletions(-)

(limited to 'OpenSim/Framework/NetworkServersInfo.cs')

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 5bb4111..4b7d4c7 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -32,19 +32,9 @@ namespace OpenSim.Framework
 {
     public class NetworkServersInfo
     {
-        public string AssetSendKey = String.Empty;
-        public string AssetURL = "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/";
-
-        public string GridRecvKey = String.Empty;
-        public string GridSendKey = String.Empty;
-        public string GridURL = String.Empty;
         public uint HttpListenerPort = ConfigSettings.DefaultRegionHttpPort;
-        public string InventoryURL = String.Empty;
         public bool secureInventoryServer = false;
         public bool isSandbox;
-        public string UserRecvKey = String.Empty;
-        public string UserSendKey = String.Empty;
-        public string UserURL = String.Empty;
         public bool HttpUsesSSL = false;
         public string HttpSSLCN = "";
         public uint httpSSLPort = 9001;
@@ -55,8 +45,6 @@ namespace OpenSim.Framework
         public string cert_path = String.Empty;
         public string cert_pass = String.Empty;
 
-        public string MessagingURL = String.Empty;
-
         public NetworkServersInfo()
         {
         }
@@ -65,33 +53,14 @@ namespace OpenSim.Framework
         {
         }
 
-
         public void loadFromConfiguration(IConfigSource config)
         {
-
             HttpListenerPort =
                 (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort);
             httpSSLPort =
                 (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1));
             HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
             HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
-            GridURL =
-                config.Configs["Network"].GetString("grid_server_url",
-                                                    "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString());
-            GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");
-            GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");
-            UserURL =
-                config.Configs["Network"].GetString("user_server_url",
-                                                    "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
-            UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
-            UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
-            AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
-            InventoryURL = config.Configs["Network"].GetString("inventory_server_url",
-                                                               "http://127.0.0.1:" +
-                                                               ConfigSettings.DefaultInventoryServerHttpPort.ToString());
-            secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
-
-            MessagingURL = config.Configs["Network"].GetString("messaging_server_url", string.Empty);
 
             // "Out of band management https"
             ssl_listener = config.Configs["Network"].GetBoolean("https_listener",false);
-- 
cgit v1.1