3 files changed, 12 insertions, 11 deletions

diff --git a/linden/indra/newview/linux_tools/exposed-symbols.txt b/linden/indra/newview/linux_tools/exposed-symbols.txt
new file mode 100644
index 0000000..98df90a
--- /dev/null
+++ b/linden/indra/newview/linux_tools/exposed-symbols.txt
@@ -0,0 +1,3 @@
+initllpython
+createLLImageJ2CKDU
+destroyLLImageJ2CKDU
diff --git a/linden/indra/newview/linux_tools/hidesymbols.ver b/linden/indra/newview/linux_tools/hidesymbols.ver
deleted file mode 100644
index 6ce7719..0000000
--- a/linden/indra/newview/linux_tools/hidesymbols.ver
+++ /dev/null
@@ -1,9 +0,0 @@
-LL_PRIVATE {
-        global:
-                initllpython;
-                createLLImageJ2CKDU;
-                destroyLLImageJ2CKDU;
-        local:
-                *;
-};
-
diff --git a/linden/indra/newview/linux_tools/package-client.sh b/linden/indra/newview/linux_tools/package-client.sh
index 1446e78..b054386 100755
--- a/linden/indra/newview/linux_tools/package-client.sh
+++ b/linden/indra/newview/linux_tools/package-client.sh
@@ -106,8 +106,15 @@ then
     echo 'Default grid - creating empty gridargs.dat'
     echo " " > $PACKAGE_NAME/gridargs.dat
 else
-    echo "Creating gridargs.dat for package, grid $GRID"
-    echo "--${GRID} -helperuri http://preview-${GRID}.secondlife.com/helpers/" > $PACKAGE_NAME/gridargs.dat
+    if [ X$GRID == X'firstlook' ]
+    then
+        # firstlook is a special case... it's not really a grid.
+        echo "Creating gridargs.dat for firstlook"
+        echo "-settings settings_firstlook.xml" > $PACKAGE_NAME/gridargs.dat
+    else
+        echo "Creating gridargs.dat for package, grid $GRID"
+        echo "-settings settings_beta.xml --${GRID} -helperuri http://preview-${GRID}.secondlife.com/helpers/" > $PACKAGE_NAME/gridargs.dat
+    fi
 fi
 
 TARBALL=$PACKAGE_NAME.tar.bz2