aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs5
-rw-r--r--OpenSim/Grid/GridServer.Config/DbGridConfig.cs5
-rw-r--r--OpenSim/Grid/UserServer.Config/DbUserConfig.cs3
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;
30using System.IO; 30using System.IO;
31 31
32using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Configuration;
33using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
34using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
35using OpenSim.Framework.Configuration; 36using OpenSim.Framework.Configuration;
@@ -50,6 +51,8 @@ namespace OpenSim.Grid.AssetServer
50 /// </summary> 51 /// </summary>
51 public class OpenAsset_Main : conscmd_callback 52 public class OpenAsset_Main : conscmd_callback
52 { 53 {
54 public AssetConfig Cfg;
55
53 public static OpenAsset_Main assetserver; 56 public static OpenAsset_Main assetserver;
54 57
55 private LogBase m_console; 58 private LogBase m_console;
@@ -95,7 +98,7 @@ namespace OpenSim.Grid.AssetServer
95 setupDB(m_config); 98 setupDB(m_config);
96 99
97 m_console.Verbose("ASSET", "Starting HTTP process"); 100 m_console.Verbose("ASSET", "Starting HTTP process");
98 BaseHttpServer httpServer = new BaseHttpServer(8003); 101 BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort);
99 102
100 httpServer.AddStreamHandler( new GetAssetStreamHandler(this)); 103 httpServer.AddStreamHandler( new GetAssetStreamHandler(this));
101 httpServer.AddStreamHandler(new PostAssetStreamHandler( this )); 104 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 @@
27*/ 27*/
28using System; 28using System;
29using Db4objects.Db4o; 29using Db4objects.Db4o;
30using OpenSim.Framework.Configuration;
30using OpenSim.Framework.Console; 31using OpenSim.Framework.Console;
31using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
32 33
@@ -68,12 +69,12 @@ namespace OpenGrid.Config.GridConfigDb4o
68 this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team"); 69 this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
69 70
70 // Asset Options 71 // Asset Options
71 this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/"); 72 this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/");
72 this.AssetSendKey = MainLog.Instance.CmdPrompt("Key to send to asset server","null"); 73 this.AssetSendKey = MainLog.Instance.CmdPrompt("Key to send to asset server","null");
73 this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null"); 74 this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
74 75
75 // User Server Options 76 // User Server Options
76 this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/"); 77 this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/");
77 this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null"); 78 this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null");
78 this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null"); 79 this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null");
79 80
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 @@
27*/ 27*/
28using System; 28using System;
29using Db4objects.Db4o; 29using Db4objects.Db4o;
30using OpenSim.Framework.Configuration;
30using OpenSim.Framework.Console; 31using OpenSim.Framework.Console;
31using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
32 33
@@ -50,7 +51,7 @@ namespace OpenUser.Config.UserConfigDb4o
50 51
51 this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); 52 this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
52 53
53 this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/"); 54 this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/");
54 this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null"); 55 this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");
55 this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null"); 56 this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
56 } 57 }