Attempt to work around Mac issue with missing package llsd

.github/workflows/build_viewer.yml

@@ -14,8 +14,6 @@ env:
   EXTRA_ARGS: -DUSE_FMODSTUDIO=ON -DUSE_KDU=ON --crashreporting
   build_secrets_checkout: ${{github.workspace}}/signing
   XZ_DEFAULTS: -T0
-
-
 jobs:
   build_matrix:
     strategy:
@@ -25,21 +23,28 @@ jobs:
         addrsize: [64]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install Bash 4 and GNU sed on Mac
+        if: runner.os == 'macOS'
+        run: |
+          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+          brew update
+          brew install bash
+          brew install gnu-sed
+
+          echo "/usr/local/bin" >> $GITHUB_PATH
+          echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
+
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
-        id: py311
+        id: py312
         with:
-          python-version: '3.11'
+          python-version: '3.11.6'
           cache: 'pip'
 
-      - if: runner.os == 'Windows'
-        run: |
-          python3 -m pip install -r requirements.txt --user
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - if: runner.os != 'Windows'
+      - name: Install python requirements
         run: |
           python3 -m pip install -r requirements.txt
+          python -m pip install -r requirements.txt
 
       - name: Check python version
         run: python -V
@@ -54,6 +59,14 @@ jobs:
           EOF
         shell: bash
 
+      - name: Test python3 llsd
+        run: |
+          python3 - <<EOF
+          import llsd
+          print("Hello from inline Python script!")
+          EOF
+        shell: bash
+
       - name: Free Disk Space (Ubuntu)
         if: runner.os == 'Linux'
         uses: jlumbroso/free-disk-space@main
@@ -66,17 +79,6 @@ jobs:
           echo "CC=gcc-10" >> $GITHUB_ENV
           echo "CXX=g++-10" >> $GITHUB_ENV
 
-      - name: Install Bash 4 and GNU sed on Mac
-        if: runner.os == 'macOS'
-        run: |
-          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-          brew update
-
-          brew install bash
-          brew install gnu-sed
-
-          echo "/usr/local/bin" >> $GITHUB_PATH
-          echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
 
       - name: Setup rclone and download the folder
         uses: beqjanus/setup-rclone@main

indra/newview/viewer_manifest.py

@@ -53,8 +53,13 @@ viewer_dir = os.path.dirname(__file__)
 # indra.util.llmanifest under their system Python!
 sys.path.insert(0, os.path.join(viewer_dir, os.pardir, "lib", "python"))
 from indra.util.llmanifest import LLManifest, main, path_ancestors, CHANNEL_VENDOR_BASE, RELEASE_CHANNEL, ManifestError, MissingError
-import llsd
-
+# <FS:Beq> try to work around weird Mac build issue that seems to find the wrong python
+#import llsd
+try:
+    import llsd
+except ImportError:
+    from llbase import llsd
+# </FS:Beq>
 class ViewerManifest(LLManifest,FSViewerManifest):
     def is_packaging_viewer(self):
         # Some commands, files will only be included