viewer.git/indra/cmake/ZLIB.cmake, branch 26.1.1Megapahit's fork of the Second Life viewer.
https://megapahit.org/viewer.git/atom?h=26.1.12021-09-08T20:18:07ZSL-14541 Replace zlib with zlib-ng2021-09-08T20:18:07ZAndrey Kleshchevandreykproductengine@lindenlab.com2021-09-08T17:53:50Zurn:sha1:5af8f15a0579bc88ca4249324db8b1f19c52bbd5remove execute permission from many files that should not have it2015-11-10T14:48:56ZOz Lindenoz@lindenlab.com2015-11-10T14:48:56Zurn:sha1:c8726aba303bcf1207b730a344536e25491420bcMerge. Refresh from viewer-release after 3.7.11 release.2014-07-08T21:29:48ZMonty Brandenbergmonty@lindenlab.com2014-07-08T21:29:48Zurn:sha1:29bea5a6b94458e23559bdbeaae5a593100533b6Linux/Win: Bad checksum on Windows package. Libz and libpng linking changes to find newest code.2014-04-15T22:48:52ZMonty Brandenbergmonty@lindenlab.com2014-04-15T22:48:52Zurn:sha1:f8874d04b8ca238ee99dc464055295cff417a9b2
Windows autobuild package had a bad checksum due to oddities in the build
system. On Linux I've been fighting with getting libz 1.2.8 and libpng
1.6.8 to be the definitive version in the viewer. Problem is the *massive*
library search tree we assemble. We find older shared library versions
first and so those dominated. By using --whole-archive with static libraries,
the packaged versions of these libraries are made definitive.
OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS2014-03-19T21:30:07ZOz Lindenoz@lindenlab.com2014-03-19T21:30:07Zurn:sha1:776aadf4ef65681084268c3866058172c89b4259Update Mac and Windows breakpad builds to latest2013-03-29T14:50:08ZGraham Madaraszgraham@lindenlab.com2013-03-29T14:50:08Zurn:sha1:bf6182daa8b4d7cea79310547f71d7a3155e17b0QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.32009-05-04T17:43:26ZAdam Mossmoss@lindenlab.com2009-05-04T17:43:26Zurn:sha1:cc92525b0df952659102d2e5adcc4140fea7f371
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)2009-02-18T21:10:16ZBrad Kittenbrinkbrad@lindenlab.com2009-02-18T21:10:16Zurn:sha1:abdc99f21b542c4fea67030ddbd7166c9d1c6c63
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme2008-06-12T20:51:41ZJennifer Leechjenn@lindenlab.com2008-06-12T20:51:41Zurn:sha1:fbf15572d905799257c07d1ddfb9dea0007e89fesvn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge2008-06-02T21:14:31ZBryan O'Sullivanbos@lindenlab.com2008-06-02T21:14:31Zurn:sha1:9db949eec327df4173fde3de934a87bedb0db13c
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers