diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 1d4deac..f761813 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -68,9 +68,9 @@ namespace OpenSim.Framework.Servers | |||
68 | 68 | ||
69 | private int m_periodDiagnosticTimerMS = 60 * 60 * 1000; | 69 | private int m_periodDiagnosticTimerMS = 60 * 60 * 1000; |
70 | private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000); | 70 | private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000); |
71 | 71 | ||
72 | /// <summary> | 72 | /// <summary> |
73 | /// Random uuid for private data | 73 | /// Random uuid for private data |
74 | /// </summary> | 74 | /// </summary> |
75 | protected string m_osSecret = String.Empty; | 75 | protected string m_osSecret = String.Empty; |
76 | 76 | ||
@@ -85,7 +85,7 @@ namespace OpenSim.Framework.Servers | |||
85 | // Random uuid for private data | 85 | // Random uuid for private data |
86 | m_osSecret = UUID.Random().ToString(); | 86 | m_osSecret = UUID.Random().ToString(); |
87 | } | 87 | } |
88 | 88 | ||
89 | /// <summary> | 89 | /// <summary> |
90 | /// Must be overriden by child classes for their own server specific startup behaviour. | 90 | /// Must be overriden by child classes for their own server specific startup behaviour. |
91 | /// </summary> | 91 | /// </summary> |
@@ -104,10 +104,10 @@ namespace OpenSim.Framework.Servers | |||
104 | m_periodicDiagnosticsTimer.Interval = m_periodDiagnosticTimerMS; | 104 | m_periodicDiagnosticsTimer.Interval = m_periodDiagnosticTimerMS; |
105 | m_periodicDiagnosticsTimer.Enabled = true; | 105 | m_periodicDiagnosticsTimer.Enabled = true; |
106 | } | 106 | } |
107 | } | 107 | } |
108 | 108 | ||
109 | protected override void ShutdownSpecific() | 109 | protected override void ShutdownSpecific() |
110 | { | 110 | { |
111 | m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); | 111 | m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); |
112 | 112 | ||
113 | RemovePIDFile(); | 113 | RemovePIDFile(); |
@@ -117,12 +117,12 @@ namespace OpenSim.Framework.Servers | |||
117 | if (!SuppressExit) | 117 | if (!SuppressExit) |
118 | Environment.Exit(0); | 118 | Environment.Exit(0); |
119 | } | 119 | } |
120 | 120 | ||
121 | /// <summary> | 121 | /// <summary> |
122 | /// Provides a list of help topics that are available. Overriding classes should append their topics to the | 122 | /// Provides a list of help topics that are available. Overriding classes should append their topics to the |
123 | /// information returned when the base method is called. | 123 | /// information returned when the base method is called. |
124 | /// </summary> | 124 | /// </summary> |
125 | /// | 125 | /// |
126 | /// <returns> | 126 | /// <returns> |
127 | /// A list of strings that represent different help topics on which more information is available | 127 | /// A list of strings that represent different help topics on which more information is available |
128 | /// </returns> | 128 | /// </returns> |
@@ -148,7 +148,7 @@ namespace OpenSim.Framework.Servers | |||
148 | public virtual void Startup() | 148 | public virtual void Startup() |
149 | { | 149 | { |
150 | m_log.Info("[STARTUP]: Beginning startup processing"); | 150 | m_log.Info("[STARTUP]: Beginning startup processing"); |
151 | 151 | ||
152 | m_log.Info("[STARTUP]: version: " + m_version + Environment.NewLine); | 152 | m_log.Info("[STARTUP]: version: " + m_version + Environment.NewLine); |
153 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and | 153 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and |
154 | // the clr version number doesn't match the project version number under Mono. | 154 | // the clr version number doesn't match the project version number under Mono. |
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Servers | |||
156 | m_log.InfoFormat( | 156 | m_log.InfoFormat( |
157 | "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n", | 157 | "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n", |
158 | Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32"); | 158 | Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32"); |
159 | 159 | ||
160 | try | 160 | try |
161 | { | 161 | { |
162 | StartupSpecific(); | 162 | StartupSpecific(); |
@@ -167,18 +167,18 @@ namespace OpenSim.Framework.Servers | |||
167 | (e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message ); | 167 | (e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message ); |
168 | Environment.Exit(1); | 168 | Environment.Exit(1); |
169 | } | 169 | } |
170 | 170 | ||
171 | TimeSpan timeTaken = DateTime.Now - m_startuptime; | 171 | TimeSpan timeTaken = DateTime.Now - m_startuptime; |
172 | 172 | ||
173 | // MainConsole.Instance.OutputFormat( | 173 | // MainConsole.Instance.OutputFormat( |
174 | // "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.", | 174 | // "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.", |
175 | // timeTaken.Minutes, timeTaken.Seconds); | 175 | // timeTaken.Minutes, timeTaken.Seconds); |
176 | } | 176 | } |
177 | 177 | ||
178 | public string osSecret | 178 | public string osSecret |
179 | { | 179 | { |
180 | // Secret uuid for the simulator | 180 | // Secret uuid for the simulator |
181 | get { return m_osSecret; } | 181 | get { return m_osSecret; } |
182 | } | 182 | } |
183 | 183 | ||
184 | public string StatReport(IOSHttpRequest httpRequest) | 184 | public string StatReport(IOSHttpRequest httpRequest) |
@@ -187,8 +187,8 @@ namespace OpenSim.Framework.Servers | |||
187 | if (httpRequest.Query.ContainsKey("callback")) | 187 | if (httpRequest.Query.ContainsKey("callback")) |
188 | { | 188 | { |
189 | return httpRequest.Query["callback"].ToString() + "(" + StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");"; | 189 | return httpRequest.Query["callback"].ToString() + "(" + StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");"; |
190 | } | 190 | } |
191 | else | 191 | else |
192 | { | 192 | { |
193 | return StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version); | 193 | return StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version); |
194 | } | 194 | } |