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/Services/FSAssetService | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Services/FSAssetService')
-rw-r--r-- | OpenSim/Services/FSAssetService/FSAssetService.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs index cddd288..ca2f459 100644 --- a/OpenSim/Services/FSAssetService/FSAssetService.cs +++ b/OpenSim/Services/FSAssetService/FSAssetService.cs | |||
@@ -115,7 +115,7 @@ namespace OpenSim.Services.FSAssetService | |||
115 | } | 115 | } |
116 | 116 | ||
117 | IConfig assetConfig = config.Configs[configName]; | 117 | IConfig assetConfig = config.Configs[configName]; |
118 | 118 | ||
119 | if (assetConfig == null) | 119 | if (assetConfig == null) |
120 | throw new Exception("No AssetService configuration"); | 120 | throw new Exception("No AssetService configuration"); |
121 | 121 | ||
@@ -128,12 +128,12 @@ namespace OpenSim.Services.FSAssetService | |||
128 | 128 | ||
129 | // If not found above, fallback to Database defaults | 129 | // If not found above, fallback to Database defaults |
130 | IConfig dbConfig = config.Configs["DatabaseService"]; | 130 | IConfig dbConfig = config.Configs["DatabaseService"]; |
131 | 131 | ||
132 | if (dbConfig != null) | 132 | if (dbConfig != null) |
133 | { | 133 | { |
134 | if (dllName == String.Empty) | 134 | if (dllName == String.Empty) |
135 | dllName = dbConfig.GetString("StorageProvider", String.Empty); | 135 | dllName = dbConfig.GetString("StorageProvider", String.Empty); |
136 | 136 | ||
137 | if (connectionString == String.Empty) | 137 | if (connectionString == String.Empty) |
138 | connectionString = dbConfig.GetString("ConnectionString", String.Empty); | 138 | connectionString = dbConfig.GetString("ConnectionString", String.Empty); |
139 | } | 139 | } |
@@ -156,7 +156,7 @@ namespace OpenSim.Services.FSAssetService | |||
156 | 156 | ||
157 | // Setup Fallback Service | 157 | // Setup Fallback Service |
158 | string str = assetConfig.GetString("FallbackService", string.Empty); | 158 | string str = assetConfig.GetString("FallbackService", string.Empty); |
159 | 159 | ||
160 | if (str != string.Empty) | 160 | if (str != string.Empty) |
161 | { | 161 | { |
162 | object[] args = new object[] { config }; | 162 | object[] args = new object[] { config }; |
@@ -204,7 +204,7 @@ namespace OpenSim.Services.FSAssetService | |||
204 | Store(a, false); | 204 | Store(a, false); |
205 | }); | 205 | }); |
206 | } | 206 | } |
207 | 207 | ||
208 | m_WriterThread = new Thread(Writer); | 208 | m_WriterThread = new Thread(Writer); |
209 | m_WriterThread.Start(); | 209 | m_WriterThread.Start(); |
210 | 210 | ||
@@ -214,7 +214,7 @@ namespace OpenSim.Services.FSAssetService | |||
214 | m_StatsThread.Start(); | 214 | m_StatsThread.Start(); |
215 | } | 215 | } |
216 | } | 216 | } |
217 | 217 | ||
218 | m_log.Info("[FSASSETS]: FS asset service enabled"); | 218 | m_log.Info("[FSASSETS]: FS asset service enabled"); |
219 | } | 219 | } |
220 | 220 | ||
@@ -223,7 +223,7 @@ namespace OpenSim.Services.FSAssetService | |||
223 | while (true) | 223 | while (true) |
224 | { | 224 | { |
225 | Thread.Sleep(60000); | 225 | Thread.Sleep(60000); |
226 | 226 | ||
227 | lock (m_statsLock) | 227 | lock (m_statsLock) |
228 | { | 228 | { |
229 | if (m_readCount > 0) | 229 | if (m_readCount > 0) |
@@ -723,7 +723,7 @@ namespace OpenSim.Services.FSAssetService | |||
723 | AssetBase asset = Get(args[2], out hash); | 723 | AssetBase asset = Get(args[2], out hash); |
724 | 724 | ||
725 | if (asset == null || asset.Data.Length == 0) | 725 | if (asset == null || asset.Data.Length == 0) |
726 | { | 726 | { |
727 | MainConsole.Instance.Output("Asset not found"); | 727 | MainConsole.Instance.Output("Asset not found"); |
728 | return; | 728 | return; |
729 | } | 729 | } |
@@ -765,7 +765,7 @@ namespace OpenSim.Services.FSAssetService | |||
765 | AssetBase asset = Get(args[2]); | 765 | AssetBase asset = Get(args[2]); |
766 | 766 | ||
767 | if (asset == null || asset.Data.Length == 0) | 767 | if (asset == null || asset.Data.Length == 0) |
768 | { | 768 | { |
769 | MainConsole.Instance.Output("Asset not found"); | 769 | MainConsole.Instance.Output("Asset not found"); |
770 | return; | 770 | return; |
771 | } | 771 | } |