From 14014a1dc1e650cf322c3f470cb8efb62b0b7d2a Mon Sep 17 00:00:00 2001 From: Arrehn Date: Mon, 15 Aug 2011 11:09:24 -0400 Subject: [PATCH] FIRE-1031, adjustments to linux start script to allow easier parsing on command line args. --- indra/newview/linux_tools/wrapper.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index f78fe6c9cf..a5fa578221 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -112,7 +112,9 @@ fi export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"${LD_LIBRARY_PATH}"' export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-firestorm-bin' -export SL_OPT="`cat etc/gridargs.dat` $@" + +# AO: experimentally removing to allow --settings on the command line w/o error. FIRE-1031 +#export SL_OPT="`cat etc/gridargs.dat` $@" # Run the program eval ${SL_ENV} ${SL_CMD} ${SL_OPT} || LL_RUN_ERR=runerr