* Applied Chillken patch #419: consolidate_ports-r2096-3.patch - consolidated port number defaults. Thankx Chillken!

3 files changed, 9 insertions, 4 deletions

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 9272f24..1fa27ef 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -30,6 +30,7 @@ using System;
 using System.IO;
 
 using libsecondlife;
+using OpenSim.Framework.Configuration;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Configuration;
@@ -50,6 +51,8 @@ namespace OpenSim.Grid.AssetServer
     /// </summary>
     public class OpenAsset_Main : conscmd_callback
     {
+        public AssetConfig Cfg;
+
         public static OpenAsset_Main assetserver;
 
         private LogBase m_console;
@@ -95,7 +98,7 @@ namespace OpenSim.Grid.AssetServer
             setupDB(m_config);
 
             m_console.Verbose("ASSET", "Starting HTTP process");
-            BaseHttpServer httpServer = new BaseHttpServer(8003);
+            BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort);
 
             httpServer.AddStreamHandler( new GetAssetStreamHandler(this));
             httpServer.AddStreamHandler(new PostAssetStreamHandler( this ));
diff --git a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
index d26e6c1..d81e5cc 100644
--- a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
+++ b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
@@ -27,6 +27,7 @@
 */
 using System;
 using Db4objects.Db4o;
+using OpenSim.Framework.Configuration;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 
@@ -68,12 +69,12 @@ namespace OpenGrid.Config.GridConfigDb4o
                         this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
 
             // Asset Options
-                        this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
+                        this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/");
             this.AssetSendKey = MainLog.Instance.CmdPrompt("Key to send to asset server","null");
             this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
 
             // User Server Options
-                this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
+                this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/");
                 this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null");
                 this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null");
 
diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
index 088fd40..cb0dbdd 100644
--- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
+++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
@@ -27,6 +27,7 @@
 */
 using System;
 using Db4objects.Db4o;
+using OpenSim.Framework.Configuration;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 
@@ -50,7 +51,7 @@ namespace OpenUser.Config.UserConfigDb4o
                         
                         this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
 
-                        this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
+                        this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/");
                         this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");
                         this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
                 }