From b43fc318fb6c50a0c78843f04c2fb07e3bc5d283 Mon Sep 17 00:00:00 2001
From: diva
Date: Mon, 8 Jun 2009 17:50:17 +0000
Subject: That didn't quite work. Trying this instead -- prompt given in the
 cmd line.

---
 OpenSim/Server/Base/ServicesServerBase.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Server/Base')

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 6f7c938..e1cdf66 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -79,6 +79,7 @@ namespace OpenSim.Server.Base
             argvConfig.AddSwitch("Startup", "console", "c");
             argvConfig.AddSwitch("Startup", "logfile", "l");
             argvConfig.AddSwitch("Startup", "inifile", "i");
+            argvConfig.AddSwitch("Startup", "prompt",  "p");
 
             // Automagically create the ini file name
             //
@@ -87,11 +88,16 @@ namespace OpenSim.Server.Base
 
             string iniFile = assemblyName.Name + ".ini";
 
-            // Check if a file name was given on the command line
-            //
             IConfig startupConfig = argvConfig.Configs["Startup"];
             if (startupConfig != null)
+            {
+                // Check if a file name was given on the command line
+                //
                 iniFile = startupConfig.GetString("inifile", iniFile);
+                //
+                // Check if a prompt was given on the command line
+                prompt = startupConfig.GetString("prompt", prompt);
+            }
 
             // Find out of the file name is a URI and remote load it
             // if it's possible. Load it as a local file otherwise.
-- 
cgit v1.1