diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index e4d0f3aa52..f50c4b8e8a 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -44,8 +44,8 @@ jobs: 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 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 id: py311 with: python-version: '3.11' @@ -130,12 +130,12 @@ jobs: shell: bash - name: Get the code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Checkout build vars (after the main code) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: FirestormViewer/fs-build-variables path: build-variables @@ -242,11 +242,17 @@ jobs: if: env.FS_RELEASE_TYPE == 'Nightly' run: | echo "EXTRA_ARGS=${{ env.EXTRA_ARGS}} --testbuild=14" >> $GITHUB_ENV + shell: bash - name: make Alpha builds expire after 28 days if: env.FS_RELEASE_TYPE == 'Alpha' run: | echo "EXTRA_ARGS=${{ env.EXTRA_ARGS}} --testbuild=28" >> $GITHUB_ENV - + shell: bash + - name: make Beta builds expire after 28 days + if: env.FS_RELEASE_TYPE == 'Beta' + run: | + echo "EXTRA_ARGS=${{ env.EXTRA_ARGS}} --testbuild=60" >> $GITHUB_ENV + shell: bash - name: Clean up packages to give more space run: rm *${{ env.fallback_platform }}*bz2 shell: bash @@ -269,7 +275,7 @@ jobs: # fi - name: Publish artifacts if: runner.os == 'Windows' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.FS_RELEASE_TYPE }}-${{ matrix.os }}-${{ matrix.addrsize }}-${{ matrix.grid }}-artifacts.zip path: | @@ -278,7 +284,7 @@ jobs: - name: publish Linux artifacts if: runner.os == 'Linux' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.FS_RELEASE_TYPE }}-${{ matrix.os }}-${{matrix.addrsize}}-${{matrix.grid}}-artifacts.zip path: | @@ -287,7 +293,7 @@ jobs: - name: publish MacOS artifacts if: runner.os == 'macOS' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.FS_RELEASE_TYPE }}-${{ matrix.os }}-${{matrix.addrsize}}-${{matrix.grid}}-artifacts.zip path: | @@ -355,7 +361,7 @@ jobs: echo "FS_BUILD_WEBHOOK_URL=${FS_BUILD_WEBHOOK_URL}" >> $GITHUB_ENV - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 id: download with: path: to_deploy diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml index fa180c66c9..b4b2565889 100644 --- a/.github/workflows/cla.yaml +++ b/.github/workflows/cla.yaml @@ -23,3 +23,4 @@ jobs: path-to-signatures: signatures.json remote-organization-name: secondlife remote-repository-name: cla-signatures + allowlist: callum@mbp.localdomain diff --git a/.gitignore b/.gitignore index f4b85b77a2..5e3377d62a 100755 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ indra/newview/dbghelp.dll indra/newview/filters.xml indra/newview/fmod.dll indra/newview/fmod.log +#indra/newview/fonts # Don't copy fonts to the source folder indra/newview/mozilla-theme indra/newview/mozilla-universal-darwin.tgz indra/newview/pilot.txt @@ -68,6 +69,7 @@ indra/newview/teleport_history.txt indra/newview/typed_locations.txt indra/newview/vivox-runtime indra/newview/skins/default/html/common/equirectangular/js +emoji_characters.xml indra/server-linux-* indra/temp indra/test/linden_file.dat diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 6bd8a2b74c..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,76 +0,0 @@ -# Contributor guidelines - -Thanks for your interest in contributing to Second Life! This document -summarizes some of the most important points for people looking to contribute -to the platform especially those looking to provide bug reports and code -changes. - -## Table of contents - -- [Communication](#communication) -- [Reporting bugs and requesting features](#reporting-bugs-and-requesting-features) -- [Contributing pull requests](#contributing-pull-requests) - -## Communication - -Second Life has multiple channels for communication. Some of these channels are -more end-user focused, while others are more tailored for -developer-to-developer or support. - -- [feedback.secondlife.com][] is Second Life's primary community engagement - forum. Ideas and bug reports should be placed here unless they relate to - ongoing development issues and developer-to-developer communication. -- [Public user groups][slug] are held on a regular basis, including those for - discussing open source development, content creation, server topics and more. -- [Github issues][] provide a means for staff to organize their - work and collaborate with other developers. By default most user-facing - discussions should happen on [feedback.secondlife.com][] so that they are - visible to more people, can build consensus, and be placed onto our public - roadmap. Github issues are useful for collaboration between viewer forks - and the official upstream and when engineering-specific and technical - collaboration is beneficial. -- [Official forums][] exist for many topics including content creation, - scripting, social topics and more. -- The [opensource-dev mailing list][] is useful for announcements and - discussion between viewer maintainers. - - -## Reporting bugs and requesting features - -Report bugs and provide ideas for features using the respective board on Second -Life's feedback portal: - -- [Features](https://feedback.secondlife.com/feature-requests) -- [Scripting bugs](https://feedback.secondlife.com/scripting-bugs) -- [Scripting features](https://feedback.secondlife.com/scripting-features) -- [Server bugs](https://feedback.secondlife.com/scripting-bugs) -- [Viewer bugs](https://feedback.secondlife.com/bug-reports) -- [Web/Marketplace bugs](https://feedback.secondlife.com/web-bugs) -- [Web/Marketplace features](https://feedback.secondlife.com/web-features) - -Creating posts on feedback.secondlife.com is important as it allows the greatest -exposure and input from Second Life users. It also allows Linden Lab staff to -place work on a single public roadmap. - -Issues created on feedback.secondlife.com are imported onto Github after they -have been reviewed by staff and accepted. - -## Contributing pull requests - -If you wish to contribute a new pull request, please ensure that: - -- You talk to other developers about how best to implement the work. -- The functionality is desired. Be sure to talk to users and Second Life staff to ensure - the work is a good idea and will be accepted. -- The work is high quality and the PR follows [PR etiquette][] -- You have tested the work locally - -The [Git Style Guide](https://github.com/agis/git-style-guide) is also a good -reference for best git practices. - -[feedback.secondlife.com]: https://feedback.secondlife.com -[slug]: https://community.secondlife.com/blogs/entry/6509-introducing-the-second-life-public-calendar/ -[PR etiquette]: https://gist.github.com/mikepea/863f63d6e37281e329f8 -[Github issues]: https://github.com/secondlife/viewer/issues -[Official forums]: https://community.secondlife.com/forums/ -[opensource-dev mailing list]: https://wiki.secondlife.com/wiki/OpenSource-Dev diff --git a/README.md b/README.md index cb09b89340..64993294bf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ - - Firestorm Viewer Logo - +![Firestorm Viewer Logo](doc/firestorm_256.png) **[Firestorm](https://www.firestormviewer.org/) is a free client for 3D virtual worlds such as Second Life and various OpenSim worlds where users can create, connect and chat with others from around the world.** This repository contains the official source code for the Firestorm viewer. @@ -14,15 +12,14 @@ Pre-built versions of the viewer releases for Windows, Mac and Linux can be down ## Build Instructions -Build instructions for each operating system can be found in the official [wiki](https://wiki.firestormviewer.org/). +Build instructions for each operating system can be found using the links below and in the official [wiki](https://wiki.firestormviewer.org/). -- [Windows](https://wiki.firestormviewer.org/fs_compiling_firestorm_windows) +- [Windows](doc/building_windows.md) +- [Mac](doc/building_macos.md) +- [Linux](doc/building_linux.md) -- [Mac](https://wiki.firestormviewer.org/fs_compiling_firestorm_macos) - -- [Linux](https://wiki.firestormviewer.org/fs_compiling_firestorm_linux) - -Please note that we do not provide support for compiling the viewer or issues resulting from using a self-compiled viewer. However, there is a self-compilers group within Second Life that can be joined to ask questions related to compiling the viewer: [Firestorm Self Compilers](secondlife:///app/group/2014ce4c-5393-fb67-83ac-910db84c273c/about) +> [!NOTE] +> We do not provide support for compiling the viewer or issues resulting from using a self-compiled viewer. However, there is a self-compilers group within Second Life that can be joined to ask questions related to compiling the viewer: [Firestorm Self Compilers](https://tinyurl.com/firestorm-self-compilers) ## Contribute diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt deleted file mode 100755 index 3aa979da25..0000000000 --- a/README_BUILD_FIRESTORM_LINUX.txt +++ /dev/null @@ -1,48 +0,0 @@ -First, make sure gcc-7.5.0 and g++-7.5.0 are installed. - -If you want to use licensed FMOD or KDU build libraries (they are optional) you have to provision these yourself. -If you're licensing these with Phoenix/Firestorm, ask for the libraries for fmod and kdu. Put them into: - /opt/firestorm - -If you're a community builder, you'll need to build these libraries yourself, then change your autobuild.xml file to -point to your own versions, or create a different autobuild.xml with your customizations, and use this with autobuild -instead of our default autobuild.xml There are some examples of how to build FMOD on the LL Wiki and opensource-dev -mailing list. We've created a non-KDU build target to make this easier. Everywhere you see "ReleaseFS" below, use -"ReleaseFS_open" instead. This will perform the same build, using openjpeg instead of KDU. - -Available premade firestorm-specific build targets: - ReleaseFS (includes KDU, FMODSTUDIO) - ReleaseFS_open (no KDU, no FMODSTUDIO) - RelWithDebInfoFS_open (no KDU, no FMODSTUDIO) - -To build firestorm: - autobuild build -A64 -c ReleaseFS - -Other examples: - autobuild configure -A64 -c ReleaseFS # basic configuration step, don't build, just configure - autobuild configure -A64 -c ReleaseFS -- --clean # clean the output area first, then configure - autobuild configure -A64 -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel - - autobuild build -A64 -c ReleaseFS --no-configure # default quick rebuild - autobuild build -A64 -c ReleaseFS --no-configure -- --clean # Clean rebuild - autobuild build -A64 -c ReleaseFS -- --package # Complete a build and package it into a tarball - -When using the --package switch you can set the XZ_DEFAULTS variable to -T0 to use all available CPU cores -to create the .tar.xz file. This can significantly reduce the time needed to create the archive, but it will -use a lot more memory. For example: - export XZ_DEFAULTS="-T0" - autobuild build -A64 -c ReleaseFS_open -- --package - -If you want to build with clang you can call autobuild like this: - CC=clang CXX=clang++ autobuild configure -A64 -c ReleaseFS - -Any of the configure options can also be used (and do the same thing) with the build options. -Typical LL autobuild configure options should also work, as long as they don't duplicate configuration we are -already doing. - - -Logs: - Look for logs in build-linux-x86_64/logs - -Output: - Look for output in build-linux-x86_64/newview/Release diff --git a/README_BUILD_FIRESTORM_MACOSX.txt b/README_BUILD_FIRESTORM_MACOSX.txt deleted file mode 100755 index c44631128e..0000000000 --- a/README_BUILD_FIRESTORM_MACOSX.txt +++ /dev/null @@ -1,64 +0,0 @@ -Make sure Xcode is installed, it's a (sometimes) free download from Apple. -Make sure cmake is installed, use at least a 2.8.x version. - -If you are using OSX 10.5 or 10.6, Xcode 3 will be used. Output will work on -all 10.5 systems and higher. - -If you are using OSX 10.7 (ie, Lion), the build will use Xcode 4 and your -output will only work on OSX 10.6 and higher unless you install the OS X -10.5 SDK. You can copy that from an Xcode 3 installation; you need the -directory /Developer/SDKs/MacOSX10.5.sdk and its contents. If you do this, -then the output will work on 10.5. - -Ensure you can build a stock viewer-development tree as described in the SL -wiki. Before asking for any help compiling Firestorm, make sure you can -build viewer-development first. If you try and skip this step, you may -receive much less help. -http://wiki.secondlife.com/wiki/Compiling_the_viewer_(Mac_OS_X) - -If you want to use licensed FMOD or KDU build libraries (they are optional) -you have to provision these yourself. If you're licensing these with -Phoenix/Firestorm, ask for the libraries for fmod and kdu. Put them into: - /opt/firestorm - -If you're a community builder, you'll need to build these libraries -yourself, then change your autobuild.xml file to point to your own versions, -or create a different autobuild.xml with your customizations, and use this -with autobuild instead of our default autobuild.xml There are some examples -of how to build FMOD on the LL Wiki and opensource-dev mailing list. We've -created a non-KDU build target to make this easier. Everywhere you see -"ReleaseFS" below, use "ReleaseFS_open" instead. This will perform the same -build, using openjpeg instead of KDU. - -Available premade firestorm-specific build targets: - - ReleaseFS (includes KDU, FMOD) - ReleaseFS_open (no KDU, no FMOD) - RelWithDebInfo_open (no KDU, no FMOD) - -To build firestorm: - - autobuild build -c ReleaseFS - -Other examples: - autobuild configure -c ReleaseFS # basic configuration step, don't build, just configure - autobuild configure -c ReleaseFS -- --clean # clean the output area first, then configure - autobuild configure -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel - - autobuild build -c ReleaseFS --no-configure # default quick rebuild - autobuild build -c ReleaseFS --no-configure -- --clean # Clean rebuild - -Any of the configure options can also be used (and do the same thing) with -the build options. Typical LL autobuild configure options should also work, -as long as they don't duplicate configuration we are already doing. - - -Logs: - - Look for logs in build-darwin-i386/logs - -Output: - Look for output in build-darwin-i386/newview/Release - - - diff --git a/README_BUILD_FIRESTORM_WINDOWS.txt b/README_BUILD_FIRESTORM_WINDOWS.txt deleted file mode 100755 index bc7909e9f0..0000000000 --- a/README_BUILD_FIRESTORM_WINDOWS.txt +++ /dev/null @@ -1,50 +0,0 @@ -Before you start configuring your Windows build system, be aware of our tested configurations: - Memory: You will need at least 2GB RAM, 4GB strongly recommended. - CPU: Multiple CPUs are strongly recommended. - A build can take over an hour. - Visual Studio 2017/2022 Community Edition. - -Ensure you can build a stock viewer-development try as described in the SL wiki. Before asking for any help -compiling Firestorm, make sure you can build the Second Life viewer first. If you try and skip this step, you may -receive much less help. https://wiki.secondlife.com/wiki/Build_the_Viewer_on_Windows - -If you want to use licensed FMOD or KDU build libraries (they are optional) you have to provision these yourself. -If you're licensing these with Phoenix/Firestorm, ask for the libraries for fmod and kdu. Put them into: - - c:\cygwin\opt\firestorm - -If you're a community builder, you'll need to build these libraries yourself, then change your autobuild.xml file to -point to your own versions, or create a different autobuild.xml with your customizations, and use this with autobuild -instead of our default autobuild.xml There are some examples of how to build FMOD on the LL Wiki and opensource-dev -mailing list. We've created a non-KDU build target to make this easier. Everywhere you see "ReleaseFS" below, use -"ReleaseFS_open" instead. This will perform the same build, using OpenJpeg instead of KDU. - - -To build Firestorm - a more detailed instruction can be found at https://wiki.firestormviewer.org/fs_compiling_firestorm_windows: - -Open a CMD shell and navigating to your firestorm code repo: - - autobuild build -A 64 -c ReleaseFS - -Other build targets you may use are: - - ReleaseFS (includes KDU, FMOD) - ReleaseFS_open (no KDU, no FMOD) - RelWithDebInfoFS_open (no KDU, no FMOD) - -Other examples: - autobuild configure -A 64 -c ReleaseFS # basic configuration step, don't build, just configure - autobuild configure -A 64 -c ReleaseFS -- --clean # clean the output area first, then configure - autobuild configure -A 64 -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel - - autobuild build -A 64 -c ReleaseFS --no-configure # default quick rebuild - -If you want to set custom configuration, do this in the configure step separately from build, then run "autobuild -build -A 64 -c ReleaseFS --no-configure" as a secondary step. - - -Logs: - Look for logs in build-vc1x0-64/logs - -Output: - Look for output in build-vc1x0-32/newview/Release diff --git a/autobuild.xml b/autobuild.xml index b7e9fd3272..c43b793ac4 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -530,11 +530,11 @@ archive hash - 59c1827cab82516504a2eb31e0aa7e38035b5085 + 8539775e0a0783bd252bc548b20b3472a8254c31 hash_algorithm sha1 url - https://github.com/secondlife/3p-boost/releases/download/v1.81-90bb2df/boost-1.81-darwin64-90bb2df.tar.zst + https://github.com/secondlife/3p-boost/releases/download/v1.81-09d25a7/boost-1.81-darwin64-09d25a7.tar.zst name darwin64 @@ -556,11 +556,11 @@ archive hash - 26214a33c568929ffeeb3463ce183f2888ce4fe4 + d40c86fbcb6ce064d546165cbabbf035ea80e07b hash_algorithm sha1 url - https://github.com/secondlife/3p-boost/releases/download/v1.81-90bb2df/boost-1.81-windows64-90bb2df.tar.zst + https://github.com/secondlife/3p-boost/releases/download/v1.81-09d25a7/boost-1.81-windows64-09d25a7.tar.zst name windows64 @@ -573,7 +573,7 @@ copyright (see individual source files) version - 1.81 + 1.81-09d25a7 name boost description @@ -634,11 +634,11 @@ archive hash - 7f447d30d7add80270a55cf3c53000392821a1cb + b1bb8a9c8d458d8842d79f9633fb61df12f1b0ad hash_algorithm sha1 url - https://github.com/secondlife/3p-colladadom/releases/download/v2.3.d1ef72a/colladadom-2.3.d1ef72a-darwin64-d1ef72a.tar.zst + https://github.com/secondlife/3p-colladadom/releases/download/v2.3.ab0c124/colladadom-2.3.ab0c124-darwin64-ab0c124.tar.zst name darwin64 @@ -660,11 +660,11 @@ archive hash - b32294a2f31f5b4ca49928e66832aad1bb4a88ac + 0df4c05d4efa3019afa4cbf09599df60b586fc5c hash_algorithm sha1 url - https://github.com/secondlife/3p-colladadom/releases/download/v2.3.d1ef72a/colladadom-2.3.d1ef72a-windows64-d1ef72a.tar.zst + https://github.com/secondlife/3p-colladadom/releases/download/v2.3.ab0c124/colladadom-2.3.ab0c124-windows64-ab0c124.tar.zst name windows64 @@ -677,7 +677,7 @@ copyright Copyright 2006 Sony Computer Entertainment Inc. version - 2.3.d1ef72a + 2.3.ab0c124 name colladadom @@ -885,6 +885,50 @@ description A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies. + emoji_shortcodes + + canonical_repo + https://github.com/secondlife/3p-emoji-shortcodes + copyright + Copyright 2017-2019 Miles Johnson. + description + Emoji shortcodes + license + MIT + license_file + LICENSES/emojibase-license.txt + name + emoji_shortcodes + platforms + + darwin64 + + archive + + hash + 7ac35da9b1b5c9a05954edeef3fe8e54 + url + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113242/980233/emoji_shortcodes-6.1.0.579438-darwin64-579438.tar.bz2 + + name + darwin64 + + windows64 + + archive + + hash + 087ce7e6d93dcd88b477b10d8e1ab259 + url + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113243/980244/emoji_shortcodes-6.1.0.579438-windows64-579438.tar.bz2 + + name + windows64 + + + version + 6.1.0.579438 + expat platforms @@ -952,11 +996,11 @@ archive hash - bfcc4acbe6b8dddaf10f0f7a47e4aad8 + 3f66914b7931a7e45b50c9f947eed3d1 hash_algorithm md5 url - file:///opt/firestorm/fmodstudio-2.02.18-darwin64-232960129.tar.bz2 + file:///opt/firestorm/fmodstudio-2.02.20-darwin64-240390127.tar.bz2 name darwin64 @@ -966,11 +1010,11 @@ archive hash - 14846f1a55274399362db4b674fcded6 + bbb978f21e690599aedcd44658dceeaf hash_algorithm md5 url - file:///opt/firestorm/fmodstudio-2.02.18-linux64-232801304.tar.bz2 + file:///opt/firestorm/fmodstudio-2.02.20-linux64-240390132.tar.bz2 name linux64 @@ -980,11 +1024,11 @@ archive hash - 7b38bd83eb63f25df7c5a20070a05732 + 8672d21ae8382a5526f0e17358de8575 hash_algorithm md5 url - file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.18-windows64-232801156.tar.bz2 + file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.20-windows64-240381643.tar.bz2 name windows64 @@ -997,7 +1041,7 @@ copyright FMOD Studio by Firelight Technologies Pty Ltd. version - 2.02.18 + 2.02.20 name fmodstudio description @@ -1035,6 +1079,16 @@ freetype + copyright + Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg. + description + Font rendering library + license + FreeType + license_file + LICENSES/freetype.txt + name + freetype platforms darwin64 @@ -1042,11 +1096,11 @@ archive hash - 912d122aae996483ba814fe8e569394ddca0d42e + d90a5c2fb4a729eeff3965ea6dd0a35cf146d379 hash_algorithm sha1 url - https://github.com/secondlife/3p-freetype/releases/download/v2.4.4.4f739fa/freetype-2.4.4.4f739fa-darwin64-4f739fa.tar.zst + https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.557becd/freetype-2.12.1.557becd-darwin64-557becd.tar.zst name darwin64 @@ -1056,9 +1110,11 @@ archive hash - 41db760508e6b48ae3a291ad2d1aef3d + 4a999279562e8f3e4ba02d3e78a844ddf6fe18f1 + hash_algorithm + sha1 url - https://3p.firestormviewer.org/freetype-2.8.1.223020901-linux64-223020901.tar.bz2 + https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.557becd/freetype-2.12.1.557becd-linux64-557becd.tar.zst name linux64 @@ -1068,26 +1124,18 @@ archive hash - 2c2151b439cf92e03d9573dddbbdd3b6 + 1837fdfd44204c78e79134944f824b0211817883 + hash_algorithm + sha1 url - https://3p.firestormviewer.org/freetype-2.3.9.232991153-windows64-232991153.tar.bz2 + https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.557becd/freetype-2.12.1.557becd-windows64-557becd.tar.zst name windows64 - license - FreeType - license_file - LICENSES/freetype.txt - copyright - Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg. version - 2.4.4.4f739fa - name - freetype - description - Font rendering library + 2.12.1.557becd glext @@ -1162,11 +1210,11 @@ archive hash - c016d7333a3ded88c060119b4e3a5847015a8711 + dce3174b12136746f5f910e311e895c1b47bf8fb hash_algorithm sha1 url - https://github.com/secondlife/3p-googlemock/releases/download/v1.7.0.77bba00/googlemock-1.7.0.77bba00-darwin64-77bba00.tar.zst + https://github.com/secondlife/3p-googlemock/releases/download/v1.7.0.2b109d4/googlemock-1.7.0.2b109d4-darwin64-2b109d4.tar.zst name darwin64 @@ -1188,11 +1236,11 @@ archive hash - df51dff9a820fc96c18c2bc00b64467e541633a5 + 265813f84b04c3b03f3d7d33e149b3d5e3cf31db hash_algorithm sha1 url - https://github.com/secondlife/3p-googlemock/releases/download/v1.7.0.77bba00/googlemock-1.7.0.77bba00-windows64-77bba00.tar.zst + https://github.com/secondlife/3p-googlemock/releases/download/v1.7.0.2b109d4/googlemock-1.7.0.2b109d4-windows64-2b109d4.tar.zst name windows64 @@ -1205,7 +1253,7 @@ copyright Copyright 2008, Google Inc. version - 1.7.0.77bba00 + 1.7.0.2b109d4 name googlemock description @@ -1301,6 +1349,54 @@ description Havok source code for libs and demos + icu4c + + canonical_repo + https://bitbucket.org/lindenlab/3p-icu4c + copyright + Copyright (c) 1995-2011 International Business Machines Corporation and others <http://source.icu-project.org> + description + ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software. + license + ICU, permissive non-copyleft free software license + license_file + LICENSES/icu.txt + name + icu4c + platforms + + darwin64 + + archive + + hash + 47bc32b991385f1a6530e4c6179b07f64ca6edc7 + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-icu4c/releases/download/v4.8.1-7d08d82/icu4c-4.8.1-darwin64-7d08d82.tar.zst + + name + darwin64 + + windows64 + + archive + + hash + b7db881dac80302e4d9010af34c0bf6ca9897df9 + hash_algorithm + sha1 + url + https://github.com/secondlife/3p-icu4c/releases/download/v4.8.1-7d08d82/icu4c-4.8.1-windows64-7d08d82.tar.zst + + name + windows64 + + + version + 4.8.1-7d08d82 + jpegencoderbasic platforms @@ -2220,6 +2316,62 @@ description minizip-ng is a zip manipulation library. Based on work of Gilles Vollant. + nanosvg + + canonical_repo + https://bitbucket.org/lindenlab/3p-nanosvg + copyright + Copyright (c) 2013-14 Mikko Mononen + description + NanoSVG is a simple single-header-file SVG parser and rasterizer + license + Zlib + license_file + LICENSES/nanosvg.txt + name + nanosvg + platforms + + darwin64 + + archive + + hash + 32ead724319c2ea6f65fc5be0e3157cc + url + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115452/994130/nanosvg-2022.09.27-darwin64-580364.tar.bz2 + + name + darwin64 + + linux + + archive + + hash + 84698f044598ff79e255965f3d1c3e80 + url + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115397/993664/nanosvg-2022.09.27-linux-580337.tar.bz2 + + name + linux + + windows64 + + archive + + hash + ee61ff8b866be04c325f1fe2db516d71 + url + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115454/994144/nanosvg-2022.09.27-windows64-580364.tar.bz2 + + name + windows64 + + + version + 2022.09.27 + nghttp2 platforms @@ -2925,6 +3077,48 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors description uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license. + viewer-fonts + + copyright + Copyright 2016-2022 Brad Erickson CC-BY-4.0/MIT, Copyright 2016-2022 Twitter, Inc. CC-BY-4.0, Copyright 2013 Joe Loughry and Terence Eden MIT + description + Viewer fonts + license + Various open source + license_file + LICENSES/fonts.txt + name + viewer-fonts + platforms + + darwin64 + + archive + + hash + 6041bbd4001e3951f96ac3456c7906da + url + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113314/980656/viewer_fonts-1.579464-darwin64-579464.tar.bz2 + + name + darwin64 + + windows64 + + archive + + hash + 1745ba6eec0108250446fe01d4aa065c + url + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113307/980631/viewer_fonts-1.579464-windows64-579464.tar.bz2 + + name + windows64 + + + version + 1.579464 + viewer-manager platforms @@ -3302,7 +3496,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=TRUE - + build @@ -3322,11 +3516,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE - + arguments ../indra - + name RelWithDebInfoOS @@ -3343,7 +3537,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=TRUE - + build @@ -3363,11 +3557,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE - + arguments ../indra - + name ReleaseOS @@ -3570,11 +3764,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Xcode - + arguments ../indra - + build @@ -3604,7 +3798,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Xcode - + build @@ -3634,11 +3828,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Xcode - + arguments ../indra - + build @@ -3664,7 +3858,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Xcode - + build @@ -3795,11 +3989,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Ninja -DLL_TESTS=Off - + arguments ../indra - + build @@ -3822,7 +4016,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Ninja -DLL_TESTS=Off - + build @@ -3954,11 +4148,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} -A ${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} - + arguments ..\indra - + build @@ -3968,11 +4162,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors /build RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} - + arguments SecondLife.sln - + Multiple -Use texture - Move mouse cursor over ruler - to snap to grid + Use texture + Move mouse cursor over ruler + to snap to grid Loading... @@ -582,14 +582,14 @@ https://www.firestormviewer.org/support for help fixing this problem. (no name) Nearby chat - (Nearby chat) + (Nearby chat) whispers: shouts: Connecting to in-world Voice Chat... Connected Voice not available at your current location Disconnected from in-world Voice Chat - You will now be reconnected to Nearby Voice Chat + You will now be reconnected to Nearby Voice Chat '[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS]. '[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS]. If you allow access to your account, you will also be allowing the object to: diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml index bd98798de5..0c9a031926 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml @@ -2,4 +2,6 @@ + show_emoji_helper="true" + use_color="true" + /> diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index c0a948931c..c4300c9350 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -10,11 +10,11 @@ bottom_separator_pad="1" top_header_pad="12" bottom_header_pad="5" - max_length="2147483647" - track_bottom="true" - name="chat_history" - type="string" - word_wrap="true" + max_length="2147483647" + track_bottom="true" + name="chat_history" + type="string" + word_wrap="true" line_spacing.multiple="1.0" font="SansSerif"> + + diff --git a/indra/newview/skins/default/xui/en/widgets/fs_chat_history.xml b/indra/newview/skins/default/xui/en/widgets/fs_chat_history.xml index 15f0e031bc..567b7e0311 100644 --- a/indra/newview/skins/default/xui/en/widgets/fs_chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/fs_chat_history.xml @@ -10,11 +10,11 @@ bottom_separator_pad="1" top_header_pad="12" bottom_header_pad="5" - max_length="67108864" - track_bottom="true" - name="chat_history" - type="string" - word_wrap="true" + max_length="2147483647" + track_bottom="true" + name="chat_history" + type="string" + word_wrap="true" line_spacing.multiple="1.0" trusted_content="false" font="SansSerif" diff --git a/indra/newview/skins/default/xui/es/emoji_categories.xml b/indra/newview/skins/default/xui/es/emoji_categories.xml new file mode 100644 index 0000000000..b1b73eba5e --- /dev/null +++ b/indra/newview/skins/default/xui/es/emoji_categories.xml @@ -0,0 +1,59 @@ + + + + + Name + smileys and emotion + Category + emoticonos y emoción + + + Name + people and body + Category + personas y cuerpo + + + Name + components + Category + componentes + + + Name + animals and nature + Category + animales y la naturaleza + + + Name + food and drink + Category + comida y bebida + + + Name + travel and places + Category + viajes y lugares + + + Name + activities + Category + actividades + + + Name + objects + Category + objetos + + + Name + symbols + Category + símbolos + + + diff --git a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml deleted file mode 100644 index fbdd197861..0000000000 --- a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - 1, Número total de texturas obtenidas: [NUM] - - - 2, Número total de solicitudes de obtención: [NUM] - - - 3, Número total de aciertos de caché: [NUM] - - - 4, Número total de texturas visibles: [NUM] - - - 5, Número total de solicitudes de obtención de texturas visibles: [NUM] - - - 6, Número total de datos obtenidos: [SIZE1]KB, Datos descodificados: [SIZE2]KB, [PIXEL]MPx - - - 7, Número total de datos visibles: [SIZE1]KB, Datos descodificados: [SIZE2]KB - - - 8, Número total de datos representados: [SIZE1]KB, Datos descodificados: [SIZE2]KB, [PIXEL]MPx - - - 9, Tiempo total en lecturas de caché: [TIME] s - - - 10, Tiempo total en escrituras de caché: [TIME] s - - - 11, Tiempo total en descodificaciones: [TIME] s - - - 12, Tiempo total en la creación de texturas gl: [TIME] s - - - 13, Tiempo total en obtención de HTTP: [TIME] s - - - 14, Tiempo total en obtención completa: [TIME] s - - - 15, Volviendo a obtener visibles de la caché, Tiempo: [TIME] s, Obtenidos: [SIZE]KB, [PIXEL]MPx - - - 16, Volviendo a obtener todas las texturas de caché, Tiempo: [TIME] s, Obtenidos: [SIZE]KB, [PIXEL]MPx - - - 16, Volviendo a obtener todas las texturas de caché, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles - - - 17, Reobteniendo visibles de HTTP, Tiempo: [TIME] s, Obtenidos: [SIZE]KB, [PIXEL]MPx - - - 18, Volviendo a obtener todas las texturas de HTTP, Tiempo: [TIME] s, Obtenidos: [SIZE]KB, [PIXEL]MPx - - - - 20, Origen de texturas: - - - - - -