50247533f9
Merged latest viewer/login-api with latest viewer/viewer-20
2009-10-07 17:51:28 -07:00
146e084af3
Merged in latest svn-imports-viewer-20 changes.
2009-10-07 16:12:56 -07:00
750f94ca69
EXT-1141 Remove one-click cursor icons from art directories. Cursor is now a hand for all one-click actions, at Erica's request. Deleted art files for Win/Mac/Linux, including repackaging the SDL binary download package. Reviewed with Kelly.
2009-10-07 00:15:11 +00:00
a7bef5bc90
Back out revisions 135028,134955,134953,134939
...
* Revert Vivox SDK update
2009-10-05 21:16:35 +00:00
4d53e235c2
merge of latest viewer/viewer-20
2009-10-02 10:35:42 -07:00
dde2153014
merge of latest lindenlab/svn-imports-viewer-20
2009-10-01 18:19:45 -07:00
45c053b87d
Fix yet another error in building llqtwebkit.lib, this time the release lib really links only to the release CRT.
2009-10-01 14:41:57 -07:00
0c0b59e104
New llqtwebkit package that has no embedded manifests.
2009-09-30 18:55:55 -07:00
eca30a2262
QAR-1619: merge up to 2009-09-26 viewer/viewer-20
2009-09-30 21:42:04 -04:00
af39853e7c
DEV-40702 update viewer2 vivox sdk to v3
2009-10-01 00:23:26 +00:00
bc4444cd78
Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20
2009-09-26 18:08:24 -04:00
bd0c306752
Add pth-2.0.7-linden.txt with S3 URL for the original Pth source tarball.
...
Add this file to pth.txt manifest file.
Update install.xml with the URL for new pth-2.0.7-darwin-20090923.tar.bz2.
2009-09-23 12:25:44 -04:00
f87f9d17d2
DEV-32832 OSX: freetype 2.3.9 upgrade
...
My first stab at building an OSX package, I hope the results are okay; back this out if things barf.
2009-09-22 18:56:02 +00:00
b5ed4fec54
New package of zlib since I broke the name of the debug .lib.
2009-09-21 18:51:50 -04:00
008d21eb44
New build of googlemock generated against the right CRT build to fix DLL hell.
2009-09-21 18:51:22 -04:00
05739cf8ac
Merged my recent viewer/viewer-20 + login-api merge with latest login-api including DLL hell library changes.
2009-09-18 16:33:15 -04:00
bb1d4592bd
Merged latest viewer/viewer-20 into login-api.
2009-09-18 15:22:25 -04:00
4489a018ca
Merged my daggy fix to the broken curl package with later library work.
2009-09-17 20:00:58 -04:00
9615727329
New build of windows freetype to fix CRT dll hell. This also upgrades to 2.3.9 (DEV-32831). When this merges to viewer-2.0 it should replace the build there.
2009-09-17 19:58:59 -04:00
5b98de7a4b
Fix for broken jpeglib package I just uploaded.
2009-09-17 19:49:10 -04:00
8ae5de0e31
Fix for broken windows curl package I just built. Still version 7.19.6 as per DEV-28321.
2009-09-17 19:45:00 -04:00
8e8a5bd24f
Rebuilt the following libs to fix CRT dll hell: ares expat jpeglib libpng ndofdev xmlrpc-epi zlib
2009-09-17 17:41:16 -04:00
c2623d5ab4
Rebuilding of windows curl to fix CRT dll hell. Also upgrading to 7.19.6 to avoid the need for special patching (see DEV-28321 vulnerability).
2009-09-17 16:24:16 -04:00
33130868b2
Rebuild windows apr to fix CRT dll hell. Also upgrading to apr-1.3.8/apr-util-1.3.9 in the process for DEV-38196 vulnerability.
2009-09-17 16:05:02 -04:00
a84b98e31e
Rebuilt windows boost for CRT version DLL hell, upgrading to 1.39 in the process.
2009-09-17 15:51:29 -04:00
a997e131d4
Merge with SVN viewer-2.0.0-3 branch
2009-09-09 17:10:06 -07:00
5154f4e9d2
Reenable freetype-2.3.9 for win32 (DEV-32831)
...
svn merge -c 131881 .
parabuild succeeded building this in branches/brad/freetype-2.3.9-upgrade/ so it had better work here...
2009-09-09 18:09:03 +00:00
bae94e4340
Merged login-api with viewer-2.0.0-3 up through r132290.
2009-09-01 12:21:51 -04:00
f4f02f0f34
Fix up some post-merge breakage.
2009-08-31 15:09:13 -07:00
158946668a
svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
...
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31 17:16:21 +00:00
d020dae7b9
Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
...
Some minor post-merge cleanups still required.
2009-08-27 16:25:02 -04:00
745845f799
svn merge -r 129841:129910 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.
2009-08-27 19:00:18 +00:00
71344b233d
svn merge -c-131881 .
...
back-out DEV-32831
it annoys install.py but goodness knows why.
2009-08-27 08:51:31 +00:00
dcfb520c56
DEV-32831 Win32: freetype 2.3.9 upgrade
...
patch by brad.
2009-08-27 08:08:57 +00:00
2d32f4779c
DEV-34837: The problem with prepackaging library headers is that changes in
...
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.
2009-08-05 21:36:32 -04:00
07129bf928
Merge recent changes
2009-08-05 16:10:15 -04:00
03ebc43132
DEV-34837: Remove dependency on Leopard-only /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.
2009-08-05 16:08:17 -04:00
945656147c
New linux packages for linux and linux64.
...
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...
2009-08-04 14:29:30 -07:00
134f394c25
New boost packages for windows and os x.
...
Combines the Boost.Coroutine changes in old login-api with the -Woverloaded-virtuals changes in viewer-2.0.0-3.
2009-08-03 18:50:35 -07:00
d35cd27796
Merged Nat and Palmers latest build fixes with the big viewer-2.0.0-3/login-api merge work (changeset 486d51877332)
2009-08-03 09:54:44 -07:00
084983485f
DEV-34837: update Mac apr_suite package so that each of the .dylib files
...
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.
2009-07-31 13:26:24 -04:00
a7efd0d8dd
Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups.
2009-07-30 19:39:08 -07:00
1e1a38d574
DEV-34837: Improve Mac support for LLCOMMON_LINK_SHARED.
...
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.
2009-07-30 18:51:17 -04:00
935712fc5b
New package of xmlrpc-epi that actually links to the expat libs we ship. I have no idea how this has worked for so long.
2009-07-27 18:06:35 -07:00
0274c1f2b1
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
...
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
2009-07-16 17:54:58 +00:00
541e0b1dfc
cherrypicking the fix for linux startup issue DEV-33209 - the bug has percolated
...
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
2009-07-07 10:23:45 +00:00
d6101558a1
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also 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
2009-07-06 21:58:04 +00:00
71405876b2
Updated apr_suite library package to include dll versions of apr as well.
2009-07-02 12:56:55 -04:00
7aec119d84
Merge with SVN login-api-3 branch
2009-06-25 11:12:51 -07:00
0ea53e0de4
QAR-1619: make assemblies/3rd_party_libs/linux64/boost.txt reference .a libs
...
that are actually present.
Update linux and linux64 boost tarballs with previous Windows, Mac patch.
2009-06-23 20:51:27 +00:00
brad kittenbrink