aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 6c49817..ca95a8d 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -72,6 +72,8 @@ namespace OpenSim
72 private string m_logFilename = ("region-console.log"); 72 private string m_logFilename = ("region-console.log");
73 73
74 private bool standaloneAuthenticate = false; 74 private bool standaloneAuthenticate = false;
75 private string welcomeMessage = null;
76
75 public ConsoleCommand CreateAccount = null; 77 public ConsoleCommand CreateAccount = null;
76 78
77 public OpenSimMain(IConfigSource configSource) 79 public OpenSimMain(IConfigSource configSource)
@@ -104,6 +106,7 @@ namespace OpenSim
104 m_storageDLL = configSource.Configs["Startup"].GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); 106 m_storageDLL = configSource.Configs["Startup"].GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
105 107
106 standaloneAuthenticate = configSource.Configs["Startup"].GetBoolean("standalone_authenticate", false); 108 standaloneAuthenticate = configSource.Configs["Startup"].GetBoolean("standalone_authenticate", false);
109 welcomeMessage = configSource.Configs["Startup"].GetString("standalone_welcome", "Welcome to OpenSim");
107 } 110 }
108 111
109 /// <summary> 112 /// <summary>
@@ -123,7 +126,7 @@ namespace OpenSim
123 126
124 if (m_sandbox) 127 if (m_sandbox)
125 { 128 {
126 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, standaloneAuthenticate); 129 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, standaloneAuthenticate, welcomeMessage);
127 m_commsManager = localComms; 130 m_commsManager = localComms;
128 if(standaloneAuthenticate) 131 if(standaloneAuthenticate)
129 { 132 {