diff options
author | Jeff Ames | 2008-06-04 09:59:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-06-04 09:59:27 +0000 |
commit | 4ec4e16c809cf86a63b736d2b7b6ad7291595a5f (patch) | |
tree | cfa896ef9057228171e2ee39c4807060101ba90b /OpenSim/Grid/GridServer/GridServerBase.cs | |
parent | * If a ThreadAbortException reaches AuthUser() then let it pass through unmol... (diff) | |
download | opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.zip opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.gz opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.bz2 opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.xz |
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to 'OpenSim/Grid/GridServer/GridServerBase.cs')
-rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index 8ca4296..7891c29 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Grid.GridServer | |||
43 | public class GridServerBase : BaseOpenSimServer, conscmd_callback | 43 | public class GridServerBase : BaseOpenSimServer, conscmd_callback |
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | protected GridConfig m_config; | 47 | protected GridConfig m_config; |
48 | protected GridManager m_gridManager; | 48 | protected GridManager m_gridManager; |
49 | protected List<IGridPlugin> m_plugins = new List<IGridPlugin>(); | 49 | protected List<IGridPlugin> m_plugins = new List<IGridPlugin>(); |
@@ -121,12 +121,12 @@ namespace OpenSim.Grid.GridServer | |||
121 | // Temporary hack to stop mono-addins scanning warnings from coming out on the console | 121 | // Temporary hack to stop mono-addins scanning warnings from coming out on the console |
122 | TextWriter oldOutput = Console.Out; | 122 | TextWriter oldOutput = Console.Out; |
123 | Console.SetOut(new StreamWriter(Stream.Null)); | 123 | Console.SetOut(new StreamWriter(Stream.Null)); |
124 | 124 | ||
125 | AddinManager.Initialize("."); | 125 | AddinManager.Initialize("."); |
126 | AddinManager.Registry.Update(null); | 126 | AddinManager.Registry.Update(null); |
127 | 127 | ||
128 | // Returns the console.writelines back to the console's stream | 128 | // Returns the console.writelines back to the console's stream |
129 | Console.SetOut(oldOutput); | 129 | Console.SetOut(oldOutput); |
130 | 130 | ||
131 | ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/GridServer"); | 131 | ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/GridServer"); |
132 | foreach (TypeExtensionNode node in nodes) | 132 | foreach (TypeExtensionNode node in nodes) |
@@ -175,7 +175,7 @@ namespace OpenSim.Grid.GridServer | |||
175 | catch | 175 | catch |
176 | { | 176 | { |
177 | } | 177 | } |
178 | 178 | ||
179 | if (SimResponse == "OK") | 179 | if (SimResponse == "OK") |
180 | { | 180 | { |
181 | m_simProfileManager.SimProfiles[sim.UUID].online = true; | 181 | m_simProfileManager.SimProfiles[sim.UUID].online = true; |
@@ -187,11 +187,11 @@ namespace OpenSim.Grid.GridServer | |||
187 | } | 187 | } |
188 | */ | 188 | */ |
189 | } | 189 | } |
190 | 190 | ||
191 | public override void Shutdown() | 191 | public override void Shutdown() |
192 | { | 192 | { |
193 | foreach (IGridPlugin plugin in m_plugins) plugin.Close(); | 193 | foreach (IGridPlugin plugin in m_plugins) plugin.Close(); |
194 | 194 | ||
195 | base.Shutdown(); | 195 | base.Shutdown(); |
196 | } | 196 | } |
197 | } | 197 | } |