aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-10-15 08:42:15 +0000
committerlbsa712007-10-15 08:42:15 +0000
commit9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae (patch)
treefbc6bf234f5f2c4d2ef8d5eb55b6b02a2c947238
parent* Added #474 Chillken Windows Installer generating script - haven't tried it,... (diff)
downloadopensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.zip
opensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.tar.gz
opensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.tar.bz2
opensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.tar.xz
* Applied Chillken patch #419: consolidate_ports-r2096-3.patch - consolidated port number defaults. Thankx Chillken!
-rw-r--r--OpenSim/Framework/General/Configuration/AssetConfig.cs5
-rw-r--r--OpenSim/Framework/General/Configuration/GridConfig.cs10
-rw-r--r--OpenSim/Framework/General/Configuration/UserConfig.cs8
-rw-r--r--OpenSim/Framework/General/Types/NetworkServersInfo.cs16
-rw-r--r--OpenSim/Framework/General/Types/RegionInfo.cs5
-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
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs8
9 files changed, 35 insertions, 30 deletions
diff --git a/OpenSim/Framework/General/Configuration/AssetConfig.cs b/OpenSim/Framework/General/Configuration/AssetConfig.cs
index 95f578c..a7c87ad 100644
--- a/OpenSim/Framework/General/Configuration/AssetConfig.cs
+++ b/OpenSim/Framework/General/Configuration/AssetConfig.cs
@@ -41,7 +41,8 @@ namespace OpenSim.Framework.Configuration
41 41
42 public string DatabaseProvider = ""; 42 public string DatabaseProvider = "";
43 43
44 public uint HttpPort = 8003; 44 public static uint DefaultHttpPort = 8003;
45 public uint HttpPort = DefaultHttpPort;
45 46
46 private ConfigurationMember configMember; 47 private ConfigurationMember configMember;
47 48
@@ -57,7 +58,7 @@ namespace OpenSim.Framework.Configuration
57 58
58 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 59 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
59 60
60 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8003", false); 61 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false);
61 62
62 } 63 }
63 64
diff --git a/OpenSim/Framework/General/Configuration/GridConfig.cs b/OpenSim/Framework/General/Configuration/GridConfig.cs
index 2910c5c..9020404 100644
--- a/OpenSim/Framework/General/Configuration/GridConfig.cs
+++ b/OpenSim/Framework/General/Configuration/GridConfig.cs
@@ -48,7 +48,8 @@ namespace OpenSim.Framework.Configuration
48 48
49 public string DatabaseProvider = ""; 49 public string DatabaseProvider = "";
50 50
51 public uint HttpPort = 8001; 51 public static uint DefaultHttpPort = 8001;
52 public uint HttpPort = DefaultHttpPort;
52 53
53 private ConfigurationMember configMember; 54 private ConfigurationMember configMember;
54 public GridConfig(string description, string filename) 55 public GridConfig(string description, string filename)
@@ -60,11 +61,11 @@ namespace OpenSim.Framework.Configuration
60 public void loadConfigurationOptions() 61 public void loadConfigurationOptions()
61 { 62 {
62 configMember.addConfigurationOption("grid_owner", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "OGS Grid Owner", "OGS development team", false); 63 configMember.addConfigurationOption("grid_owner", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "OGS Grid Owner", "OGS development team", false);
63 configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:8003/", false); 64 configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/", false);
64 configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false); 65 configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false);
65 configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from asset server", "null", false); 66 configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from asset server", "null", false);
66 67
67 configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:8002/", false); 68 configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/", false);
68 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); 69 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false);
69 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false); 70 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false);
70 71
@@ -72,7 +73,7 @@ namespace OpenSim.Framework.Configuration
72 configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false); 73 configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false);
73 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 74 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
74 75
75 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8001" , false); 76 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false);
76 } 77 }
77 78
78 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 79 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -109,7 +110,6 @@ namespace OpenSim.Framework.Configuration
109 case "database_provider": 110 case "database_provider":
110 this.DatabaseProvider = (string)configuration_result; 111 this.DatabaseProvider = (string)configuration_result;
111 break; 112 break;
112
113 case "http_port": 113 case "http_port":
114 HttpPort = (uint)configuration_result; 114 HttpPort = (uint)configuration_result;
115 break; 115 break;
diff --git a/OpenSim/Framework/General/Configuration/UserConfig.cs b/OpenSim/Framework/General/Configuration/UserConfig.cs
index feeccdf..d664e94 100644
--- a/OpenSim/Framework/General/Configuration/UserConfig.cs
+++ b/OpenSim/Framework/General/Configuration/UserConfig.cs
@@ -44,7 +44,8 @@ namespace OpenSim.Framework.Configuration
44 44
45 public string DatabaseProvider = ""; 45 public string DatabaseProvider = "";
46 46
47 public uint HttpPort = 8002; 47 public static uint DefaultHttpPort = 8002;
48 public uint HttpPort = DefaultHttpPort;
48 49
49 private ConfigurationMember configMember; 50 private ConfigurationMember configMember;
50 51
@@ -58,12 +59,12 @@ namespace OpenSim.Framework.Configuration
58 { 59 {
59 configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false); 60 configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false);
60 61
61 configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false); 62 configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false);
62 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false); 63 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);
63 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false); 64 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);
64 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 65 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
65 66
66 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8002", false); 67 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false);
67 68
68 } 69 }
69 70
@@ -86,7 +87,6 @@ namespace OpenSim.Framework.Configuration
86 case "database_provider": 87 case "database_provider":
87 this.DatabaseProvider = (string)configuration_result; 88 this.DatabaseProvider = (string)configuration_result;
88 break; 89 break;
89
90 case "http_port": 90 case "http_port":
91 HttpPort = (uint)configuration_result; 91 HttpPort = (uint)configuration_result;
92 break; 92 break;
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index b65488a..9e4bdb1 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Types
35{ 35{
36 public class NetworkServersInfo 36 public class NetworkServersInfo
37 { 37 {
38 public string AssetURL = "http://127.0.0.1:8003/"; 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 = "";
@@ -46,7 +46,9 @@ namespace OpenSim.Framework.Types
46 public string UserRecvKey = ""; 46 public string UserRecvKey = "";
47 public bool isSandbox; 47 public bool isSandbox;
48 48
49 public int HttpListenerPort = 9000; 49 public static int DefaultHttpListenerPort = 9000;
50 public int HttpListenerPort = DefaultHttpListenerPort;
51
50 public int RemotingListenerPort = 8895; 52 public int RemotingListenerPort = 8895;
51 53
52 54
@@ -77,15 +79,15 @@ namespace OpenSim.Framework.Types
77 m_defaultHomeLocX = (uint)config.Configs["StandAlone"].GetInt("default_location_x", 1000); 79 m_defaultHomeLocX = (uint)config.Configs["StandAlone"].GetInt("default_location_x", 1000);
78 m_defaultHomeLocY = (uint)config.Configs["StandAlone"].GetInt("default_location_y", 1000); 80 m_defaultHomeLocY = (uint)config.Configs["StandAlone"].GetInt("default_location_y", 1000);
79 81
80 HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", 9000); 82 HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort);
81 RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", 8895); 83 RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort);
82 GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:8001"); 84 GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
83 GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null"); 85 GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");
84 GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null"); 86 GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");
85 UserURL = config.Configs["Network"].GetString("user_server_url", "http://127.0.0.1:8002"); 87 UserURL = config.Configs["Network"].GetString("user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
86 UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); 88 UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
87 UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); 89 UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
88 AssetURL = config.Configs["Network"].GetString("asset_server_url", "http://127.0.0.1:8003"); 90 AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
89 91
90 } 92 }
91 } 93 }
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index c1e040d..5054510 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Types
196 { 196 {
197 errorMessage = "needs an IP Address (IPAddress)"; 197 errorMessage = "needs an IP Address (IPAddress)";
198 } 198 }
199 this.m_internalEndPoint.Port = source.Configs[sectionName].GetInt("internal_ip_port", (int)9000); 199 this.m_internalEndPoint.Port = source.Configs[sectionName].GetInt("internal_ip_port", NetworkServersInfo.DefaultHttpListenerPort);
200 200
201 string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1"); 201 string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1");
202 if (externalHost != "SYSTEMIP") 202 if (externalHost != "SYSTEMIP")
@@ -226,12 +226,11 @@ namespace OpenSim.Framework.Types
226 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (Y Axis)", "1000", false); 226 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (Y Axis)", "1000", false);
227 configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false); 227 configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
228 configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false); 228 configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false);
229 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", "9000", false); 229 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false);
230 configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); 230 configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false);
231 configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false); 231 configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false);
232 configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false); 232 configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false);
233 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false); 233 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false);
234
235 } 234 }
236 235
237 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 236 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
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 }
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index e065151..47b9ddd 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -53,14 +53,12 @@ namespace SimpleApp
53 53
54 protected override void Initialize() 54 protected override void Initialize()
55 { 55 {
56 m_httpServerPort = 9000;
57
58 StartLog(); 56 StartLog();
59 57
60 m_networkServersInfo = new NetworkServersInfo( 1000, 1000 ); 58 m_networkServersInfo = new NetworkServersInfo( 1000, 1000 );
61 59
62 LocalAssetServer assetServer = new LocalAssetServer(); 60 LocalAssetServer assetServer = new LocalAssetServer();
63 assetServer.SetServerInfo("http://localhost:8003/", ""); 61 assetServer.SetServerInfo(m_networkServersInfo.AssetURL, "");
64 62
65 m_assetCache = new AssetCache(assetServer); 63 m_assetCache = new AssetCache(assetServer);
66 } 64 }
@@ -83,8 +81,8 @@ namespace SimpleApp
83 81
84 m_log.Notice(m_log.LineInfo); 82 m_log.Notice(m_log.LineInfo);
85 83
86 IPEndPoint internalEndPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), 9000); 84 IPEndPoint internalEndPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), m_networkServersInfo.HttpListenerPort);
87 85
88 RegionInfo regionInfo = new RegionInfo(1000, 1000, internalEndPoint, "localhost"); 86 RegionInfo regionInfo = new RegionInfo(1000, 1000, internalEndPoint, "localhost");
89 regionInfo.DataStore = "simpleapp_datastore.yap"; 87 regionInfo.DataStore = "simpleapp_datastore.yap";
90 88