2 files changed, 39 insertions, 2 deletions

diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 2b831fe..5f16303 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -409,9 +409,15 @@ namespace OpenSim.Framework.Console
 
         public void MainLogPrompt()
         {
-            string[] tempstrarray;
+
             string tempstr = this.CmdPrompt(this.componentname + "# ");
-            tempstrarray = tempstr.Split(' ');
+            MainLogRunCommand(tempstr);
+        }
+
+        public void MainLogRunCommand(string command)
+        {
+            string[] tempstrarray;
+            tempstrarray = command.Split(' ');
             string cmd = tempstrarray[0];
             Array.Reverse(tempstrarray);
             Array.Resize<string>(ref tempstrarray, tempstrarray.Length - 1);
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 9f95e01..2ca3f46 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -64,6 +64,8 @@ namespace OpenSim
 
         protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll";
 
+        protected string m_startupCommandsFile = "";
+
         protected List<UDPServer> m_udpServers = new List<UDPServer>();
         protected List<RegionInfo> m_regionData = new List<RegionInfo>();
         protected List<Scene> m_localScenes = new List<Scene>();
@@ -105,6 +107,8 @@ namespace OpenSim
 
             m_storageDLL = configSource.Configs["Startup"].GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
 
+            m_startupCommandsFile = configSource.Configs["Startup"].GetString("startup_console_commands_file", "");
+
             standaloneAuthenticate = configSource.Configs["Startup"].GetBoolean("standalone_authenticate", false);
             welcomeMessage = configSource.Configs["Startup"].GetString("standalone_welcome", "Welcome to OpenSim");
         }
@@ -184,6 +188,33 @@ namespace OpenSim
             {
                 this.m_udpServers[i].ServerListener();
             }
+
+            //Run Startup Commands
+            if (m_startupCommandsFile != "")
+            {
+                MainLog.Instance.Verbose("Running startup command script (" + m_startupCommandsFile + ")");
+                if (File.Exists(m_startupCommandsFile))
+                {
+                    StreamReader readFile = File.OpenText(m_startupCommandsFile);
+                    string currentCommand = "";
+                    while ((currentCommand = readFile.ReadLine()) != null)
+                    {
+                        if (currentCommand != "")
+                        {
+                            MainLog.Instance.Verbose("Running '" + currentCommand + "'");
+                            MainLog.Instance.MainLogRunCommand(currentCommand);
+                        }
+                    }
+                }
+                else
+                {
+                    MainLog.Instance.Error("Startup command script missing. Will not run startup commands");
+                }
+            }
+            else
+            {
+                MainLog.Instance.Verbose("No startup command script specified. Moving on...");
+            }
         }
 
         private static void CreateDefaultRegionInfoXml(string fileName)