summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
AgeCommit message (Collapse)Author
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
2021-11-09SL-16320 Fix build failing due to not having any jpgsAndrey Kleshchev
2021-11-07SL-16299 Added the correct @rpath for libvlcAndrey Lihatskiy
2021-11-03SL-16299 Added entitlements for the app bundle signingAndrey Lihatskiy
2021-10-13Merge with master after latest Viewer releaseCallum Linden
2021-10-13Merge with head of Master after a new Viewer releaseCallum Prentice
2021-09-23SL-15903 SLPlugin entitlements fixAndrey Lihatskiy
2021-09-21SL-15903 Restored the lost codeAndrey Lihatskiy
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
# Conflicts: # autobuild.xml # build.sh # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-10Merge branch 'master' into DRTVWR-519 after Viewer releaseCallum Prentice
2021-07-19Merge with Master after Viewer Release (also fixed some glaring automerge ↵Callum Prentice
screw ups)
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-06-24SL-10297 windows local build fixAndrey Kleshchev
win_crash_logger will be fully removed in D520, for now just fixing local relwithdebinfo build
2021-06-17Fix for: SL-15422 Update version of CEF used in the Viewer to 91.0.4472.101. ↵Callum Prentice
Also includes a tweak to viewer_manifest.py to handle some CEF file changes"
2021-05-27SL-15211 Update OpenSSL libraryAndrey Kleshchev
2021-05-12SL-10297: Merge branch 'sl-10297-oz' into sl-10297.Nat Goodspeed
Bring in Oz's tweaks to the way BugSplat is engaged and tested, plus a few other miscellaneous goodies.
2021-05-01DRTVWR-520 Post-merge build fix + error handling improvementAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 07:50:51 +0000