summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
AgeCommit message (Collapse)Author
2023-04-04SL-18679: Find newer NSIS installation pathBennett Goble
2023-03-20Merge branch 'DRTVWR-568' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-10-23Bring back Nat's tribute to Macho Man Randy Savage by reverting:Nicky
"SL-18389 - tracking down an odd code-signing issue on mac - speculative fix - this is the only different between this and other viewers that do run correctly" This reverts commit 074ff9fd4bbe0a6c6d589b3bdf5fe1a48df0b1ed.
2022-10-20Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h
2022-10-18SL-18389 - tracking down an odd code-signing issue on mac - speculative fix ↵Callum Prentice
- this is the only different between this and other viewers that do run correctly
2022-10-01SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and ↵Andrey Kleshchev
enable partial bitstreams Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow. I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way. P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-08-23DRTVWR-558: macOS Monterey objdump apparently needs --optionNat Goodspeed
instead of -option as before.
2022-07-12SL-17754 FIXED "first_login_image.jpg" file is not loadedMnikolenko Productengine
2022-06-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-26Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-05-10SL-17376 Do not fail build if vcruntime140_1 is missingAndrey Kleshchev
If there is no vcruntime140_1 in the build system, it is likely that file is not required for the viewer to run.
2022-05-09SL-17376 Fix viewer failing due to missing vcruntime140_1Andrey Kleshchev
2022-05-08- Slightly better documentation string for --configuration, as this really ↵Nicky
is used for the configs build subdirectory. - Always pass the correct configuration for --buildtype - Use 'buildtype' when determining defbug/release/... build. --configuration should not be used for this, as it is the subdirectories name (CMAKE_CFG_INTDIR)
2022-05-01Fix for viewer_manifest.py using a hardcoded path to grab runtime files.Nicky
2022-04-18Merge remote-tracking branch 'origin/DRTVWR-543-maint' into ↵Nicky
DRTVWR-543-maint_cmake
2022-04-18Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfloatersearch.cpp # indra/newview/llgroupactions.cpp # indra/newview/llvovolume.cpp
2022-04-09Cleanup windows step that copies input artifacts. Make sure the rightNicky
paths are used, throw out files not even existing anymore.
2022-04-07When opening contributions.txt viewer_manifest.py was making assumptios of ↵Nicky
the build tree layout and how it should be relative to the source tree. This is not necessarily correct. By using 'source' and constructiong the path relative to this directory we always get a correct answer.
2022-04-05Merged in SL-16918 (pull request #898)Sabrina Shanman
SL-16918: Improve click and drag on minimap Approved-by: Andrey Lihatskiy
2022-03-28SL-17079: Merge 'sl-17079' into DRTVWR-546 for Mac updater fix.Nat Goodspeed
2022-03-22More DRTVWR-550 Teamcity build fix. another piece of python2 syntax leftover ↵Brad Kittenbrink
in an error handling block
2022-03-22Fix DRTVWR-550 TeamCity build. codesigning retry block had some leftover ↵Brad Kittenbrink
python2 syntax
2022-03-14Revert "Debug Fmod with logging"Andrey Kleshchev
This reverts commits b21c17eee973dc06c1392dd45dbc19c1ce394852 and 2f78338aeb3d0297813bc9c9c7a9d75a2055000d. 'Debug Fmod' was not an intended commit, was meant for local testing. But might be a good idea to make this a part of DebWithRelInfo or provide a cmake switch.
2022-03-09More DRTVWR-550 Teamcity build fix. another piece of python2 syntax leftover ↵Brad Kittenbrink
in an error handling block
2022-03-09Fix DRTVWR-550 TeamCity build. codesigning retry block had some leftover ↵Brad Kittenbrink
python2 syntax
2022-03-09Fix DRTVWR-550 TeamCity build. codesigning retry block had some leftover ↵Brad Kittenbrink
python2 syntax
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' of bitbucket.org:lindenlab/viewer into SL-9749Howard Stearns
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-02-23Debug Fmod with logging #2Andrey Kleshchev
2022-02-22SL-9748 - Place cube.dae in ppRODataDir on all platforms.Howard Stearns
2022-02-22SL-9748 - Option to compute uploaded mesh physics shape from a cube.Howard Stearns
2022-02-08Merge branch 'DRTVWR-555' into DRTVWR-553+555Andrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llappviewer.cpp # indra/newview/viewer_manifest.py
2022-02-03DRTVWR-555 Sign SLVersionChecker with the hardened runtimeAndrey Lihatskiy
2022-02-01SL-13792: Cannot mix print statement and print function.Nat Goodspeed
'from __future__ import print_function' not only makes the print() function available, it also makes the Python 2 print statement invalid syntax. Until we merge with the Python 3 branch (soon!), don't import print_function: instead revert to 'print >> sys.stderr' statements.
2022-02-01SL-13792: _greenlet.so is no longer exposed in Mac viewer app bundle.Nat Goodspeed
Instead we have a new bundled executable SLVersionChecker, so that must be signed instead of _greenlet.so.
2021-12-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
2021-12-16Merge branch 'SL-15742' into DRTVWR-527-maintAndrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-11Merge branch 'master' into SL-15742Bennett Goble
2021-12-10SL-15742: Convert build scripts to Python 3Bennett Goble
This changeset makes it possible to build the Second Life viewer using Python 3. It is designed to be used with an equivalent Autobuild branch so that a developer can compile without needing Python 2 on their machine. Breaking change: Python 2 support ending Rather than supporting two versions of Python, including one that was discontinued at the beginning of the year, this branch focuses on pouring future effort into Python 3 only. As a result, scripts do not need to be backwards compatible. This means that build environments, be they on personal computers and on build agents, need to have a compatible interpreter. Notes - SLVersionChecker will still use Python 2 on macOS - Fixed the message template url used by template_verifier.py
2021-11-19Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvoicevivox.cpp
2021-11-16Merge branch master (DRTVWR-545) into DRTVWR-542-meshoptAndrey Kleshchev
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-11-10SL-14403 Removed glodAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 08:29:01 +0000