Commit Graph

507 Commits (08ae21f52dbbe6245ac8deee0fdfd5df4d3dba53)

Author SHA1 Message Date
Graham Madarasz (Graham) 2dcbbf04c9 Improve curl/ares init behavior by duping handles instead of calling easy_init 2013-02-28 09:45:43 -08:00
Dave Parks 954ebaed84 Automated merge with https://bitbucket.org/lindenlab/viewer-tiger 2013-01-08 13:40:59 -06:00
Oz Linden 1c7f19c865 change to use lindenlab repo for havok source, with new license 2012-12-19 09:45:28 -05:00
Oz Linden 0ed83541bf upgrade boost build to use public build of icu4c 2012-12-19 09:41:59 -05:00
simon@Simon-PC.lindenlab.com 7fe4fbe674 Pull in upstream viewer-development via viewer-lion 2012-12-04 15:03:34 -08:00
Dave Parks 5d34ac552f Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-11-20 17:03:55 -06:00
Dave Parks 7491fbd677 MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max performance
Reviewed by Simon.
2012-11-19 17:40:43 -06:00
Nat Goodspeed e66dacddfd Update to Boost 1.52 package with gcc 4.1 warning fix. 2012-11-17 11:17:57 -05:00
Nat Goodspeed 12a3f2ea72 Use new 3p-boost 1.52 build with Windows /Zc:wchar_t- compile switch. 2012-11-16 07:08:17 -05:00
calluym_linden 48da6d4578 Changed format of Windows Boost 3p lib - Amazon S3 chokes on sub-domain version and no one knows why 2012-11-13 13:41:02 -08:00
callum 92acb99f6f Point autobuild at new Boost 1.52 third-party libs 2012-11-12 15:55:17 -08:00
Oz Linden 1709952adb pull back 3.4.1-beta6 fixes 2012-10-10 21:40:10 -04:00
Monty Brandenberg 0755cb098d Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.
Two fairly simple conflicts:  dead stats sending code in the
texture fetch code (new llcorehttp library) and the cleanup
code in llappviewer was moved around in 3.4.x.
2012-11-07 13:28:42 -05:00
Monty Brandenberg 04e8d074b2 DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
This was yet another refresh from v-d because of significant changes
to lltexturefetch that would not have been resolvable by casual
application of any merge tool.  There are still a few questions
outstanding but this is the initial, optimistic merge.
2012-09-07 12:53:07 -04:00
simon@Simon-PC.lindenlab.com 38acb45af8 Merge in latest viewer-development 2012-09-05 17:17:54 -07:00
Oz Linden 43d29ea03e merge changes for DRTVWR-202 2012-08-22 17:11:10 -04:00
Aura Linden efdcf045b0 Merged in from viewer-development. 2012-08-17 08:07:15 -07:00
Oz Linden a7d8b42509 merge up to latest viewer-development 2012-08-16 08:52:26 -04:00
Oz Linden b9e43dfd64 merge back beta fixes 2012-08-15 20:09:41 -04:00
Oz Linden f4fb073ae0 open-146: correct licenses in llphysicsextensions stub 2012-08-14 18:30:11 -04:00
Monty Brandenberg fdb2ae8335 Merge of viewer-development (3.4.1). 2012-08-03 11:57:51 -04:00
David Kaprielian 4ed9dfd47b Fixing up the string in the code sign flag. 2012-08-01 16:25:56 -07:00
David Kaprielian 27d5547478 Added necessary signing information to autobuild.xml 2012-08-01 12:56:51 -07:00
Oz Linden df93749819 merge up to latest viewer-development 2012-07-31 14:55:15 -04:00
Brad Payne (Vir Linden) 58d5e223b8 merge 2012-07-30 15:02:02 -04:00
Brad Payne (Vir Linden) a5c9d89b28 merge 2012-07-30 14:57:33 -04:00
callum 0cd08985b3 MAINT-1056 FIX Microsoft SkyDrive is not compatible with Second Life
Reviewed by YP
2012-07-27 13:35:00 -07:00
Oz Linden 01b7959e01 update to latest builds of llphysicsextensionss 2012-07-25 12:31:16 -04:00
Oz Linden ef37311e9e merge up to latest viewer-pathfinding (including 3.3.4) 2012-07-24 13:11:14 -04:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
Oz Linden 12b1ec6264 refactor to build llphysicsextensions_tpv package for sublicensees 2012-07-20 07:38:12 -07:00
Todd Stinson 0e592855eb Updating to the latest llphysicsextension source package. 2012-07-17 19:06:35 -07:00
Oz Linden a34c1e9a0c update the llphysicsextensions stub package to match the source package 2012-07-12 08:59:07 -04:00
Matthew Breindel (Falcon) 713aa9f25d Updating to latest llphysicsextensions build. This should remove the dependency on cmake 2.8.2 for Linux. 2012-07-11 22:50:45 +00:00
Oz Linden deee0222bd use the Linden Libraries builds for llphysicsextensions, with cmake fix for linux 2012-07-11 11:15:16 -04:00
Oz Linden f4b0b9d8fd apply latest builds with fixes from falcon 2012-07-11 10:35:34 -04:00
Matthew Breindel (Falcon) 9f455c3cb5 Fixing md5sum for linux 3p-havok-source dependency. 2012-07-11 03:54:31 +00:00
Matthew Breindel (Falcon) 9fa98e13eb Hopefully fixed windows build. Now support -DLL_DEBUG_HAVOK:BOOL=ON to enable Havok Hyrbid (fulldebug) libs to link in Windows RelWithDebInfo. On other platforms, that flag will cause RelWithDebInfo to link against Havok fulldebug libs. The rest of the time, RelWithDebInfo will link to Havok Debug and Debug will link to Havok Fulldebug 2012-07-11 03:16:33 +00:00
Oz Linden 14acd7de30 experimental change for windows debug build 2012-07-10 17:44:55 -04:00
Monty Brandenberg 1c3af2658e SH-3192 Fix Boost 1.48.0 libraries to support Debug builds on Windows.
Tweaked the boost source as per Boost issue #6185 using 1.49.0 sources
and this picks up the new build.  Debug viewer builds and runs.
2012-07-10 13:29:24 -04:00
Oz Linden e2dffdb38e update llphysicsextension-source build to address linux build issue 2012-07-09 17:52:53 -04:00
Oz Linden 9c4d1c7791 changes to build real sources (works locally on a Mac) 2012-07-09 12:57:18 -04:00
Oz Linden 92fb006835 update llphysicsextensions source and stub packages 2012-07-05 12:16:02 -04:00
Oz Linden 21ee5f8d41 successful build with llphysicsextensions stub 2012-07-05 09:39:21 -04:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
callum 64fc52d85e MAINT-1056 FIX Microsoft SkyDrive is not compatible with Second Life
Reviewed by YP
2012-07-27 13:35:00 -07:00
Oz Linden 1cad2d9de2 update to 20120702 build of havok 2012-07-05 06:33:47 -04:00
Oz Linden 14f754f160 begin integrating building of llphysicsextensions from source here (incomplete) 2012-07-05 06:08:34 -04:00
Monty Brandenberg 8e5197a71b Merge 3.3.3 release with Drano HTTP library at 3.3.0
Big delta was converting the new texture debugger support code
to the new library.  Viewer manifest should probably get an eyeball
before release.
2012-07-02 18:06:22 -04:00
Oz Linden 764d1e3caf merge up to 3.3.3-release 2012-06-28 10:35:22 -04:00