Age | Commit message (Collapse) | Author |
|
|
|
|
|
including DLL hell library changes.
|
|
|
|
|
|
2.3.9 (DEV-32831). When this merges to viewer-2.0 it should replace the build there.
|
|
|
|
per DEV-28321.
|
|
ndofdev xmlrpc-epi zlib
|
|
avoid the need for special patching (see DEV-28321 vulnerability).
|
|
apr-1.3.8/apr-util-1.3.9 in the process for DEV-38196 vulnerability.
|
|
process.
|
|
|
|
svn merge -c 131881 .
parabuild succeeded building this in branches/brad/freetype-2.3.9-upgrade/ so it had better work here...
|
|
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
|
|
merge (r131929).
Some minor post-merge cleanups still required.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
|
|
back-out DEV-32831
it annoys install.py but goodness knows why.
|
|
patch by brad.
|
|
different branches must be manually merged. Here I've applied the Linden patch
to boost::coroutines found in
http://svn.lindenlab.com/svn/lindenlib/trunk/boost_1_34_1/boost-coroutine-linden.patch
and rebuilt the Mac boost package.
|
|
|
|
/usr/local/lib/libexpat.0.1.0.dylib.
On Mac, add libexpat[.0.5.0].dylib to apr_suite package. Update
libapr-1[.0.3.7].dylib and libaprutil-1[.0.3.8].dylib with versions that
reference this expat. Make viewer_manifiest.py copy expat dylib to app bundle.
|
|
Combines the Boost.Coroutine changes in old login-api with the -Woverloaded-virtuals changes in viewer-2.0.0-3.
I could not verify the 64 bit build for now, as other breakage is getting in the way...
|
|
Combines the Boost.Coroutine changes in old login-api with the -Woverloaded-virtuals changes in viewer-2.0.0-3.
|
|
viewer-2.0.0-3/login-api merge work (changeset 486d51877332)
|
|
self-identifies as @executable_path/../Resources/filename. This allows the SL
executable to find it at runtime in its official place in the app bundle.
Change viewer_manifest.py to copy libllcommon.dylib, libapr*.dylib to app
bundle's Resources subdir.
|
|
I'll need to rebuild that, plus a couple other minor clenaups.
|
|
Update Mac apr_suite package, introducing libapr-1.0.3.7.dylib and
libaprutil-1.0.3.8.dylib. We want to use dynamic APR libraries, but
libllcommon.dylib isn't allowed to depend on .so libraries: must be .dylibs
themselves.
Tweak APR.cmake to reference the aforementioned .dylibs when on Mac with
LLCOMMON_LINK_SHARED set. Eliminate some redundancy in Windows section.
For .dylibs, RunBuildTest.cmake must set DYLD_LIBRARY_PATH: LD_LIBRARY_PATH
only affects search for .so files.
PENDING:
CMake dependencies broken? With LLCOMMON_LINK_SHARED on, it seems we need to
build libllcommon.dylib explicitly before full build can succeed.
This snapshot does NOT yet copy the llcommon, apr or aprutil dylibs into the
app bundle.
|
|
have no idea how this has worked for so long.
|
|
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
|
|
around for so long without the fix that I can't stand it any longer.
svn merge -c123659
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-15-sandbox-3
|
|
UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
|
|
|
|
|
|
that are actually present.
Update linux and linux64 boost tarballs with previous Windows, Mac patch.
|
|
|
|
ignore-dead-branch
|
|
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
|
|
|
|
instances. LLCoros::launch() intends to address three issues:
- ownership of coroutine instance
- cleanup of coroutine instance when it terminates
- central place to twiddle MSVC optimizations to bypass DEV-32777 crash.
Initially coded on Mac; will address the third bullet on Windows.
Adapt listenerNameForCoro() to consult LLCoros::getName() if applicable.
Change LLLogin::Impl::connect() to use LLCoros::launch().
LLCoros::getName() relies on patch to boost::coroutines::coroutine::self to
introduce get_id().
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
|
|
Reviewed by Mani.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-7 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-8
|
|
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
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1
QAR-1459 etch builds enabled
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
|
|
the XML files.
|