aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs4
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs22
2 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index b7a51bc..5e1daee 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Framework
63 configMember.addConfigurationOption("default_user_server", 63 configMember.addConfigurationOption("default_user_server",
64 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 64 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
65 "Default User Server URI", 65 "Default User Server URI",
66 "http://127.0.0.1:8002" + "/", false); 66 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/", false);
67 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 67 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
68 "Key to send to user server", "null", false); 68 "Key to send to user server", "null", false);
69 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 69 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -71,7 +71,7 @@ namespace OpenSim.Framework
71 configMember.addConfigurationOption("default_grid_server", 71 configMember.addConfigurationOption("default_grid_server",
72 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 72 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
73 "Default Grid Server URI", 73 "Default Grid Server URI",
74 "http://127.0.0.1:8001/", false); 74 "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false);
75 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 75 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
76 "Key to send to grid server", "null", false); 76 "Key to send to grid server", "null", false);
77 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 77 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index a273676..433b040 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -47,14 +47,14 @@ namespace OpenSim.Framework.Servers
47 /// server. 47 /// server.
48 /// </summary> 48 /// </summary>
49 private Timer m_periodicLogStatsTimer = new Timer(60 * 60 * 1000); 49 private Timer m_periodicLogStatsTimer = new Timer(60 * 60 * 1000);
50 50
51 protected ConsoleBase m_console; 51 protected ConsoleBase m_console;
52 52
53 /// <summary> 53 /// <summary>
54 /// Time at which this server was started 54 /// Time at which this server was started
55 /// </summary> 55 /// </summary>
56 protected DateTime m_startuptime; 56 protected DateTime m_startuptime;
57 57
58 /// <summary> 58 /// <summary>
59 /// Record the initial startup directory for info purposes 59 /// Record the initial startup directory for info purposes
60 /// </summary> 60 /// </summary>
@@ -80,11 +80,11 @@ namespace OpenSim.Framework.Servers
80 { 80 {
81 m_startuptime = DateTime.Now; 81 m_startuptime = DateTime.Now;
82 m_version = VersionInfo.Version; 82 m_version = VersionInfo.Version;
83 83
84 m_periodicLogStatsTimer.Elapsed += new ElapsedEventHandler(LogStats); 84 m_periodicLogStatsTimer.Elapsed += new ElapsedEventHandler(LogStats);
85 m_periodicLogStatsTimer.Enabled = true; 85 m_periodicLogStatsTimer.Enabled = true;
86 } 86 }
87 87
88 /// <summary> 88 /// <summary>
89 /// Print statistics to the logfile, if they are active 89 /// Print statistics to the logfile, if they are active
90 /// </summary> 90 /// </summary>
@@ -93,7 +93,7 @@ namespace OpenSim.Framework.Servers
93 if (m_stats != null) 93 if (m_stats != null)
94 { 94 {
95 m_log.Info(m_stats.Report()); 95 m_log.Info(m_stats.Report());
96 } 96 }
97 } 97 }
98 98
99 /// <summary> 99 /// <summary>
@@ -131,10 +131,10 @@ namespace OpenSim.Framework.Servers
131 Notice("quit - equivalent to shutdown."); 131 Notice("quit - equivalent to shutdown.");
132 132
133 Notice("show info - show server information (e.g. startup path)."); 133 Notice("show info - show server information (e.g. startup path).");
134 134
135 if (m_stats != null) 135 if (m_stats != null)
136 Notice("show stats - show statistical information for this server"); 136 Notice("show stats - show statistical information for this server");
137 137
138 Notice("show uptime - show server startup time and uptime."); 138 Notice("show uptime - show server startup time and uptime.");
139 Notice("show version - show server version."); 139 Notice("show version - show server version.");
140 Notice("shutdown - shutdown the server.\n"); 140 Notice("shutdown - shutdown the server.\n");
@@ -165,9 +165,9 @@ namespace OpenSim.Framework.Servers
165 { 165 {
166 case "info": 166 case "info":
167 Notice("Version: " + m_version ); 167 Notice("Version: " + m_version );
168 Notice("Startup directory: " + m_startupDirectory); 168 Notice("Startup directory: " + m_startupDirectory);
169 break; 169 break;
170 170
171 case "stats": 171 case "stats":
172 if (m_stats != null) 172 if (m_stats != null)
173 { 173 {
@@ -255,7 +255,7 @@ namespace OpenSim.Framework.Servers
255 { 255 {
256 OSString = Util.ReadEtcIssue(); 256 OSString = Util.ReadEtcIssue();
257 } 257 }
258 258
259 if (OSString.Length > 45) 259 if (OSString.Length > 45)
260 { 260 {
261 OSString = OSString.Substring(0, 45); 261 OSString = OSString.Substring(0, 45);