diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index e2b2bbc..156d022 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -205,7 +205,10 @@ namespace OpenSim | |||
205 | { | 205 | { |
206 | IConfigSource DefaultConfig = new IniConfigSource(); | 206 | IConfigSource DefaultConfig = new IniConfigSource(); |
207 | if (DefaultConfig.Configs["Startup"] == null) | 207 | if (DefaultConfig.Configs["Startup"] == null) |
208 | { | ||
208 | DefaultConfig.AddConfig("Startup"); | 209 | DefaultConfig.AddConfig("Startup"); |
210 | } | ||
211 | |||
209 | IConfig config = DefaultConfig.Configs["Startup"]; | 212 | IConfig config = DefaultConfig.Configs["Startup"]; |
210 | if (config != null) | 213 | if (config != null) |
211 | { | 214 | { |
@@ -225,7 +228,9 @@ namespace OpenSim | |||
225 | } | 228 | } |
226 | 229 | ||
227 | if (DefaultConfig.Configs["StandAlone"] == null) | 230 | if (DefaultConfig.Configs["StandAlone"] == null) |
231 | { | ||
228 | DefaultConfig.AddConfig("StandAlone"); | 232 | DefaultConfig.AddConfig("StandAlone"); |
233 | } | ||
229 | 234 | ||
230 | config = DefaultConfig.Configs["StandAlone"]; | 235 | config = DefaultConfig.Configs["StandAlone"]; |
231 | if (config != null) | 236 | if (config != null) |
@@ -242,7 +247,10 @@ namespace OpenSim | |||
242 | } | 247 | } |
243 | 248 | ||
244 | if (DefaultConfig.Configs["Network"] == null) | 249 | if (DefaultConfig.Configs["Network"] == null) |
250 | { | ||
245 | DefaultConfig.AddConfig("Network"); | 251 | DefaultConfig.AddConfig("Network"); |
252 | } | ||
253 | |||
246 | config = DefaultConfig.Configs["Network"]; | 254 | config = DefaultConfig.Configs["Network"]; |
247 | if (config != null) | 255 | if (config != null) |
248 | { | 256 | { |
@@ -262,7 +270,10 @@ namespace OpenSim | |||
262 | } | 270 | } |
263 | 271 | ||
264 | if (DefaultConfig.Configs["RemoteAdmin"] == null) | 272 | if (DefaultConfig.Configs["RemoteAdmin"] == null) |
273 | { | ||
265 | DefaultConfig.AddConfig("RemoteAdmin"); | 274 | DefaultConfig.AddConfig("RemoteAdmin"); |
275 | } | ||
276 | |||
266 | config = DefaultConfig.Configs["RemoteAdmin"]; | 277 | config = DefaultConfig.Configs["RemoteAdmin"]; |
267 | if (config != null) | 278 | if (config != null) |
268 | { | 279 | { |
@@ -270,12 +281,16 @@ namespace OpenSim | |||
270 | } | 281 | } |
271 | 282 | ||
272 | if (DefaultConfig.Configs["Voice"] == null) | 283 | if (DefaultConfig.Configs["Voice"] == null) |
284 | { | ||
273 | DefaultConfig.AddConfig("Voice"); | 285 | DefaultConfig.AddConfig("Voice"); |
286 | } | ||
287 | |||
274 | config = DefaultConfig.Configs["Voice"]; | 288 | config = DefaultConfig.Configs["Voice"]; |
275 | if (config != null) | 289 | if (config != null) |
276 | { | 290 | { |
277 | config.Set("enabled", "false"); | 291 | config.Set("enabled", "false"); |
278 | } | 292 | } |
293 | |||
279 | return DefaultConfig; | 294 | return DefaultConfig; |
280 | 295 | ||
281 | } | 296 | } |
@@ -741,18 +756,23 @@ namespace OpenSim | |||
741 | return; | 756 | return; |
742 | } | 757 | } |
743 | 758 | ||
744 | if (null != inventoryFolder) | 759 | if (null == inventoryFolder) |
745 | { | 760 | { |
746 | m_log.InfoFormat("[CONSOLE]: Found folder {0} {1} at {2}", inventoryFolder.Name, inventoryFolder.ID, invPath); | 761 | if (null == inventoryItem) |
747 | } | 762 | { |
748 | else if (null != inventoryItem) | 763 | m_log.ErrorFormat("[CONSOLE]: Could not find inventory entry at path {0}", invPath); |
749 | { | 764 | return; |
750 | m_log.InfoFormat("[CONSOLE]: Found item {0} {1} at {2}", inventoryItem.Name, inventoryItem.ID, invPath); | 765 | } |
766 | else | ||
767 | { | ||
768 | m_log.InfoFormat("[CONSOLE]: Found item {0} {1} at {2}", inventoryItem.Name, inventoryItem.ID, | ||
769 | invPath); | ||
770 | } | ||
751 | } | 771 | } |
752 | else | 772 | else |
753 | { | 773 | { |
754 | m_log.ErrorFormat("[CONSOLE]: Could not find inventory entry at path {0}", invPath); | 774 | m_log.InfoFormat("[CONSOLE]: Found folder {0} {1} at {2}", inventoryFolder.Name, inventoryFolder.ID, |
755 | return; | 775 | invPath); |
756 | } | 776 | } |
757 | } | 777 | } |
758 | 778 | ||