diff options
author | Jeff Ames | 2008-03-25 01:45:23 +0000 |
---|---|---|
committer | Jeff Ames | 2008-03-25 01:45:23 +0000 |
commit | d2b1a8aa1ee9396f8f73ce8a54e554a2fe730438 (patch) | |
tree | b18d370d10dadc5c15d1d98933887f970a2ef0a2 /OpenSim/Grid/GridServer | |
parent | * Added llApplyImpulse in the local frame. (diff) | |
download | opensim-SC-d2b1a8aa1ee9396f8f73ce8a54e554a2fe730438.zip opensim-SC-d2b1a8aa1ee9396f8f73ce8a54e554a2fe730438.tar.gz opensim-SC-d2b1a8aa1ee9396f8f73ce8a54e554a2fe730438.tar.bz2 opensim-SC-d2b1a8aa1ee9396f8f73ce8a54e554a2fe730438.tar.xz |
Minor formatting / svn properties cleanup.
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index acefe3f..884ba4f 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs | |||
@@ -45,13 +45,13 @@ namespace OpenSim.Grid.GridServer | |||
45 | { | 45 | { |
46 | protected GridConfig m_config; | 46 | protected GridConfig m_config; |
47 | protected GridManager m_gridManager; | 47 | protected GridManager m_gridManager; |
48 | protected BaseHttpServer httpServer; | 48 | protected BaseHttpServer httpServer; |
49 | protected List<IGridPlugin> m_plugins = new List<IGridPlugin>(); | 49 | protected List<IGridPlugin> m_plugins = new List<IGridPlugin>(); |
50 | 50 | ||
51 | public BaseHttpServer HttpServer | 51 | public BaseHttpServer HttpServer |
52 | { | 52 | { |
53 | get { return httpServer; } | 53 | get { return httpServer; } |
54 | } | 54 | } |
55 | 55 | ||
56 | public void Work() | 56 | public void Work() |
57 | { | 57 | { |
@@ -63,7 +63,7 @@ namespace OpenSim.Grid.GridServer | |||
63 | } | 63 | } |
64 | } | 64 | } |
65 | 65 | ||
66 | public GridServerBase( ) | 66 | public GridServerBase() |
67 | { | 67 | { |
68 | m_console = new ConsoleBase("OpenGrid", this); | 68 | m_console = new ConsoleBase("OpenGrid", this); |
69 | MainConsole.Instance = m_console; | 69 | MainConsole.Instance = m_console; |
@@ -137,7 +137,6 @@ namespace OpenSim.Grid.GridServer | |||
137 | m_plugins.Add(plugin); | 137 | m_plugins.Add(plugin); |
138 | } | 138 | } |
139 | } | 139 | } |
140 | |||
141 | 140 | ||
142 | protected virtual void SetupGridManager() | 141 | protected virtual void SetupGridManager() |
143 | { | 142 | { |