diff options
author | Jeff Ames | 2008-05-16 01:22:11 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-16 01:22:11 +0000 |
commit | 65c5efe43b68700bad94076d4cd421160203c5de (patch) | |
tree | 589b56649ed02f4942671fd6e51c6dc43f682e0d /OpenSim/Grid/AssetServer/Main.cs | |
parent | Thank you very much, mjm for : (diff) | |
download | opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.zip opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.tar.gz opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.tar.bz2 opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index 1b1f9c7..2aca8ff 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
@@ -48,11 +48,11 @@ namespace OpenSim.Grid.AssetServer | |||
48 | 48 | ||
49 | public AssetConfig m_config; | 49 | public AssetConfig m_config; |
50 | 50 | ||
51 | public static OpenAsset_Main assetserver; | 51 | public static OpenAsset_Main assetserver; |
52 | 52 | ||
53 | // Temporarily hardcoded - should be a plugin | 53 | // Temporarily hardcoded - should be a plugin |
54 | protected IAssetLoader assetLoader = new AssetLoaderFileSystem(); | 54 | protected IAssetLoader assetLoader = new AssetLoaderFileSystem(); |
55 | 55 | ||
56 | private IAssetProvider m_assetProvider; | 56 | private IAssetProvider m_assetProvider; |
57 | 57 | ||
58 | [STAThread] | 58 | [STAThread] |
@@ -81,7 +81,7 @@ namespace OpenSim.Grid.AssetServer | |||
81 | public OpenAsset_Main() | 81 | public OpenAsset_Main() |
82 | { | 82 | { |
83 | m_console = new ConsoleBase("OpenAsset", this); | 83 | m_console = new ConsoleBase("OpenAsset", this); |
84 | 84 | ||
85 | MainConsole.Instance = m_console; | 85 | MainConsole.Instance = m_console; |
86 | } | 86 | } |
87 | 87 | ||
@@ -166,7 +166,7 @@ namespace OpenSim.Grid.AssetServer | |||
166 | 166 | ||
167 | public void LoadDefaultAssets() | 167 | public void LoadDefaultAssets() |
168 | { | 168 | { |
169 | assetLoader.ForEachDefaultXmlAsset(StoreAsset); | 169 | assetLoader.ForEachDefaultXmlAsset(StoreAsset); |
170 | } | 170 | } |
171 | 171 | ||
172 | protected void StoreAsset(AssetBase asset) | 172 | protected void StoreAsset(AssetBase asset) |
@@ -177,9 +177,9 @@ namespace OpenSim.Grid.AssetServer | |||
177 | public override void RunCmd(string cmd, string[] cmdparams) | 177 | public override void RunCmd(string cmd, string[] cmdparams) |
178 | { | 178 | { |
179 | base.RunCmd(cmd, cmdparams); | 179 | base.RunCmd(cmd, cmdparams); |
180 | 180 | ||
181 | switch (cmd) | 181 | switch (cmd) |
182 | { | 182 | { |
183 | case "shutdown": | 183 | case "shutdown": |
184 | m_console.Close(); | 184 | m_console.Close(); |
185 | Environment.Exit(0); | 185 | Environment.Exit(0); |