From 5818958a9a6c5a10743928973172d255632af6de Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Mon, 24 Sep 2007 02:41:13 +0000 Subject: *** CHANGED CONFIG BEHAVIOUR *** * Changed really strange LocalSettings behaviour with enforcing hard-coded plugin names if none supplied * UserServices and InventoryPlugin will only load if supplied with filename --- .../Communications/Local/CommunicationsLocal.cs | 26 +++++++++------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'OpenSim/Region/Communications/Local/CommunicationsLocal.cs') diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index 1f54310..3031b8a 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs @@ -44,13 +44,13 @@ namespace OpenSim.Region.Communications.Local public LocalUserServices UserServices; public LocalLoginService LoginServices; public LocalInventoryService InvenServices; - + protected LocalSettings m_settings; - protected CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) + protected CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache) : base(serversInfo, httpServer, assetCache) { - + } public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings) @@ -94,7 +94,7 @@ namespace OpenSim.Region.Communications.Local if (cmmdParams.Length < 2) { - + firstName = MainLog.Instance.CmdPrompt("First name", "Default"); lastName = MainLog.Instance.CmdPrompt("Last name", "User"); password = MainLog.Instance.PasswdPrompt("Password"); @@ -126,7 +126,7 @@ namespace OpenSim.Region.Communications.Local { return LLUUID.Zero; } - else + else { this.InvenServices.CreateNewUserInventory(userProf.UUID); Console.WriteLine("Created new inventory set for " + firstName + " " + lastName); @@ -136,23 +136,17 @@ namespace OpenSim.Region.Communications.Local public class LocalSettings { - public string WelcomeMessage = ""; + public string WelcomeMessage; public bool AccountAuthentication = false; - public string InventoryPlugin = "OpenSim.Framework.Data.SQLite.dll"; - public string UserDatabasePlugin = "OpenSim.Framework.Data.DB4o.dll"; + public string InventoryPlugin; + public string UserDatabasePlugin; public LocalSettings(string welcomeMessage, bool accountsAuthenticate, string inventoryPlugin, string userPlugin) { WelcomeMessage = welcomeMessage; AccountAuthentication = accountsAuthenticate; - if (inventoryPlugin != "") - { - InventoryPlugin = inventoryPlugin; - } - if (userPlugin != "") - { - UserDatabasePlugin = userPlugin; - } + InventoryPlugin = inventoryPlugin; + UserDatabasePlugin = userPlugin; } } -- cgit v1.1