Add command-line switches --lua "chunk" and --luafile pathname.

--lua "chunk" runs the specified Lua chunk at startup time.

--luafile pathname runs the specified Lua script file at startup time.

You may specify more than one --lua or --luafile switch on the command line.

3 files changed, 93 insertions, 19 deletions

diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 340334aee8..534d1d594d 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -195,7 +195,33 @@
       <string>LogPerformance</string>
     </map>
 
-    <key>multiple</key>		  
+    <key>lua</key>
+    <map>
+      <key>desc</key>
+      <string>Run specified Lua chunk</string>
+      <key>count</key>
+      <integer>1</integer>
+      <!-- you can specify multiple such chunks -->
+      <key>compose</key>
+      <boolean>true</boolean>
+      <key>map-to</key>
+      <string>LuaChunk</string>
+    </map>
+
+    <key>luafile</key>
+    <map>
+      <key>desc</key>
+      <string>Run specified Lua script</string>
+      <key>count</key>
+      <integer>1</integer>
+      <!-- you can specify multiple such scripts -->
+      <key>compose</key>
+      <boolean>true</boolean>
+      <key>map-to</key>
+      <string>LuaScript</string>
+    </map>
+
+    <key>multiple</key>
     <map>
       <key>desc</key>
       <string>Allow multiple viewers.</string>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 5e4cd4e57b..bda07f8821 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -68,7 +68,7 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-	<key>CrashHostUrl</key>
+    <key>CrashHostUrl</key>
     <map>
       <key>Comment</key>
       <string>A URL pointing to a crash report handler; overrides cluster negotiation to locate crash handler.</string>
@@ -5431,6 +5431,28 @@
       <key>Value</key>
       <string>http://wiki.secondlife.com/wiki/[LSL_STRING]</string>
     </map>
+    <key>LuaChunk</key>
+    <map>
+      <key>Comment</key>
+      <string>Zero or more Lua chunks to run</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>LLSD</string>
+      <key>Value</key>
+      <array />
+    </map>
+    <key>LuaScript</key>
+    <map>
+      <key>Comment</key>
+      <string>Zero or more Lua script files to run</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>LLSD</string>
+      <key>Value</key>
+      <array />
+    </map>
     <key>GridStatusRSS</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 4a43133ff6..5ad6f1dc1e 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -60,6 +60,7 @@
 #include "llslurl.h"
 #include "llstartup.h"
 #include "llfocusmgr.h"
+#include "llluamanager.h"
 #include "llurlfloaterdispatchhandler.h"
 #include "llviewerjoystick.h"
 #include "llallocator.h"
@@ -386,6 +387,9 @@ static std::string gLaunchFileOnQuit;
 // Used on Win32 for other apps to identify our window (eg, win_setup)
 const char* const VIEWER_WINDOW_CLASSNAME = "Second Life";
 
+void processComposeSwitch(const std::string&, const std::string&,
+                          const std::function<void(const LLSD&)>&);
+
 //----------------------------------------------------------------------------
 
 // List of entries from strings.xml to always replace
@@ -1194,22 +1198,10 @@ bool LLAppViewer::init()
     }
 #endif //LL_RELEASE_FOR_DOWNLOAD
 
-    {
-        // Iterate over --leap command-line options. But this is a bit tricky: if
-        // there's only one, it won't be an array at all.
-        LLSD LeapCommand(gSavedSettings.getLLSD("LeapCommand"));
-        LL_DEBUGS("InitInfo") << "LeapCommand: " << LeapCommand << LL_ENDL;
-        if (LeapCommand.isDefined() && !LeapCommand.isArray())
-        {
-            // If LeapCommand is actually a scalar value, make an array of it.
-            // Have to do it in two steps because LeapCommand.append(LeapCommand)
-            // trashes content! :-P
-            LLSD item(LeapCommand);
-            LeapCommand.append(item);
-        }
-        BOOST_FOREACH(const std::string& leap, llsd::inArray(LeapCommand))
+    processComposeSwitch(
+        "--leap", "LeapCommand",
+        [](const LLSD& leap)
         {
-            LL_INFOS("InitInfo") << "processing --leap \"" << leap << '"' << LL_ENDL;
             // We don't have any better description of this plugin than the
             // user-specified command line. Passing "" causes LLLeap to derive a
             // description from the command line itself.
@@ -1217,8 +1209,21 @@ bool LLAppViewer::init()
             // don't consider any one --leap command mission-critical, so if one
             // fails, log it, shrug and carry on.
             LLLeap::create("", leap, false); // exception=false
-        }
-    }
+        });
+    processComposeSwitch(
+        "--lua", "LuaChunk",
+        [](const LLSD& chunk)
+        {
+            // no completion callback: we don't need to know
+            LLLUAmanager::runScriptLine(chunk);
+        });
+    processComposeSwitch(
+        "--luafile", "LuaScript",
+        [](const LLSD& script)
+        {
+            // no completion callback: we don't need to know
+            LLLUAmanager::runScriptFile(script);
+        });
 
     if (gSavedSettings.getBOOL("QAMode") && gSavedSettings.getS32("QAModeEventHostPort") > 0)
     {
@@ -1291,6 +1296,27 @@ bool LLAppViewer::init()
 	return true;
 }
 
+void processComposeSwitch(const std::string& option,
+                          const std::string& setting,
+                          const std::function<void(const LLSD&)>& action)
+{
+    // Iterate over 'option' command-line options. But this is a bit tricky:
+    // if there's only one, it won't be an array at all.
+    LLSD args(gSavedSettings.getLLSD(setting));
+    LL_DEBUGS("InitInfo") << option << ": " << args << LL_ENDL;
+    if (args.isDefined() && ! args.isArray())
+    {
+        // If args is actually a scalar value, make an array of it. Have to do
+        // it in two steps because args.append(args) trashes content! :-P
+        args.append(LLSD(args));
+    }
+    for (const auto& arg : llsd::inArray(args))
+    {
+        LL_INFOS("InitInfo") << "processing " << option << ' ' << arg << LL_ENDL;
+        action(arg);
+    }
+}
+
 void LLAppViewer::initMaxHeapSize()
 {
 	//set the max heap size.