diff options
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 2ca3f46..0114cc6 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -74,7 +74,9 @@ namespace OpenSim | |||
74 | private string m_logFilename = ("region-console.log"); | 74 | private string m_logFilename = ("region-console.log"); |
75 | 75 | ||
76 | private bool standaloneAuthenticate = false; | 76 | private bool standaloneAuthenticate = false; |
77 | private string welcomeMessage = null; | 77 | private string standaloneWelcomeMessage = null; |
78 | private string standaloneInventoryPlugin = ""; | ||
79 | private string standaloneUserPlugin = ""; | ||
78 | 80 | ||
79 | public ConsoleCommand CreateAccount = null; | 81 | public ConsoleCommand CreateAccount = null; |
80 | 82 | ||
@@ -109,8 +111,10 @@ namespace OpenSim | |||
109 | 111 | ||
110 | m_startupCommandsFile = configSource.Configs["Startup"].GetString("startup_console_commands_file", ""); | 112 | m_startupCommandsFile = configSource.Configs["Startup"].GetString("startup_console_commands_file", ""); |
111 | 113 | ||
112 | standaloneAuthenticate = configSource.Configs["Startup"].GetBoolean("standalone_authenticate", false); | 114 | standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false); |
113 | welcomeMessage = configSource.Configs["Startup"].GetString("standalone_welcome", "Welcome to OpenSim"); | 115 | standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim"); |
116 | standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); | ||
117 | standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll"); | ||
114 | } | 118 | } |
115 | 119 | ||
116 | /// <summary> | 120 | /// <summary> |
@@ -130,7 +134,8 @@ namespace OpenSim | |||
130 | 134 | ||
131 | if (m_sandbox) | 135 | if (m_sandbox) |
132 | { | 136 | { |
133 | CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, standaloneAuthenticate, welcomeMessage); | 137 | CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate, standaloneInventoryPlugin, standaloneUserPlugin); |
138 | CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings); | ||
134 | m_commsManager = localComms; | 139 | m_commsManager = localComms; |
135 | if(standaloneAuthenticate) | 140 | if(standaloneAuthenticate) |
136 | { | 141 | { |