1f8b37e9ad
merge
2013-10-16 11:52:43 -04:00
9c313aea13
merge changes for DRTVWR-336
2013-10-15 17:47:37 -04:00
015597bb58
STORM-1831 Importing Oz's updates for libxml2
2013-10-12 03:07:22 +01:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
eaef5e63d5
Merge. Pull in viewer-release after materials viewer release.
2013-09-19 13:13:37 -04:00
91850b6cfa
updated autobuild reference to llappearance-utility
2013-09-09 16:28:44 -07:00
8dc273b942
correct some doc strings in the autobuild config file
2013-09-05 15:18:58 -04:00
f00b6c7133
Merge. Pull in viewer-release after SSA merge.
2013-08-26 18:54:39 -04:00
a45806e17c
Okay, move openssl back to the weird 0.9.8/1.0.0 mix it was
...
before. Move libcurl forward to 7.24.0 and built on 0.9.8.
Until we do some TC work, we may be stuck with this combo.
2013-08-26 15:35:34 -04:00
912995de62
Moved OpenSSL to 1.0.1e as an experiement. Can't build llqtwebkit
...
so that doesn't move. 3p-curl does, however, and this gets them
all. I suspect I'll be backing down to 0.9.8 next week.
2013-08-23 20:41:01 -04:00
cb8c94cc88
updated appearance utility source
2013-08-23 16:27:39 -07:00
0d1850ef0b
updated appearance utility source
2013-08-23 15:53:18 -07:00
c4cda389af
Okay, move openssl back to 0.9.8q as we have compiler issues
...
on the build farm. This, at least, gets us through the openssl->
libcurl->viewer dependency chain.
2013-08-22 19:48:45 -04:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
cc999b225e
merge cleanup, making sure our branch has the latest autobuild changes.
2013-08-19 11:55:49 -04:00
faa0866ca3
SH-4401 FIX back-end changes to handle new visual param groups.
2013-08-08 13:21:18 -04:00
629bda7cf3
merge changes for 3.6.2-release
2013-08-05 15:27:05 -04:00
32b8d398ec
increment viewer version to 3.6.3
2013-08-05 14:42:37 -04:00
df5dff372b
BUIDLFIX: point to fixed build of llappearanceutilities
2013-07-31 14:43:44 -07:00
247a5a15d6
BUIDLFIX: point to fixed build of llappearanceutilities
2013-07-31 12:21:49 -07:00
f496361568
BUILDFIX: point at newest version of llappearanceutility
2013-07-22 15:24:45 -07:00
ce9962b338
Merged in viewer-release
2013-07-11 17:49:13 -07:00
6c440d1b51
remove command line option that causes warning messages
2013-07-03 09:15:33 -04:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
1236c920ea
BUIDLFIX: point to updated version of llappearanceutility-source
2013-06-19 19:55:31 -07:00
d847b9dc3f
Can't use bash local keyword outside of functions.
2013-06-06 19:42:22 -04:00
36812775a4
Updated llappearance-utility-source autobuild package to latest and changed debian changelog mangling to include codeticket number.
2013-06-06 18:53:06 -04:00
613b949e2f
BUILDFIX: pointed autobuild at updated llappearanceutilities
2013-06-06 15:28:59 -07:00
a07cee746c
Updated to latest llappearanceutility
2013-06-05 17:34:25 -04:00
3340eb8c71
Updated to latest llappearanceutility package
2013-06-05 10:46:12 -04:00
74ea01d6f2
merge changes for maint-2718
2013-05-22 14:40:26 -04:00
1d8b9ff07c
MAINT-2718 FIX Update Windows version of FMOD Ex DLLs with non-logging versions
2013-05-21 21:38:09 -07:00
a04a706c1b
merge
2013-05-21 16:18:48 -04:00
c96b8281a9
Thanks mercurial.
2013-05-15 20:56:51 -07:00
e1c1428569
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
2013-05-11 20:38:23 -07:00
7ff4d16041
Updating appearance utility
2013-05-11 08:28:40 +00:00
5bb540ddbf
Updating appearance utility
2013-05-11 04:12:31 +00:00
6074f65991
Merge with vwr-dev-mat
2013-05-10 10:34:26 -07:00
4d22c32aa9
merge changes for 3.5.2-beta4
2013-05-10 10:56:40 -04:00
1b984d8f40
merge changes for 3.5.1-release
2013-05-08 14:46:00 -04:00
545e033d1e
merge changes for DRTVWR-299
2013-05-07 15:11:55 -04:00
c9aae997a0
LLAppearance package update
2013-05-06 10:43:18 -04:00
0ef6ca8879
Updated llappearanceutility-source package.
2013-05-03 19:57:40 -04:00
be008638aa
Updated appearance package
2013-05-03 14:37:06 -05:00
f3cc77377a
Updated appearance util.
2013-05-03 12:17:43 -04:00
7e599539f0
LLAppearance package update
2013-05-01 16:58:02 -04:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
c198d9db81
LLAppearance package update
2013-04-26 15:55:39 -05:00
2c617e0beb
llappearance package update
2013-04-26 14:33:49 -05:00
37b64c18f5
Fix llmediadataclient test to include new dep on llprimitive and fix bogus boost lib refs in llprimitive cmake def
2013-04-26 07:28:35 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
cafb5b0d47
updating appearance utility source package
2013-04-24 21:55:03 +00:00
82e3efeddc
merge changes for OPEN-173
2013-04-22 10:16:02 -04:00
b7cf8931d4
OPEN-173 FIX FMODEx Music stutters once every few seconds (OSS patch via Latif Khalifa & Siana Gearz) - additional fix. Team City gave me the wrong MD5 for 3p-package
2013-04-19 17:16:23 -07:00
d9de58b46a
OPEN-173 FIX FMODEx Music stutters once every few seconds (OSS patch via Latif Khalifa & Siana Gearz)
2013-04-19 16:29:11 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
88eff41649
Merge with viewer-development
2013-04-17 13:38:04 -07:00
2d713a2815
Google Breakpad Fix. Code reviewed by DaveP
2013-03-29 13:22:29 -07:00
9a49b1ef5f
Dueling checksums
2013-03-29 01:40:10 -07:00
39ea211cd7
Viewer breakpad linux fixes
2013-03-29 01:27:10 -07:00
f18fd58c8c
Move to latest linux breakpad package
2013-03-29 00:29:39 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
903996e8d4
Google Breakpad Fix
2013-03-28 19:25:51 -07:00
742b301059
Plug in Oz built-by-magic breakpad packages for testing
2013-03-28 19:07:13 -07:00
8e54486468
Add new linux breakpad build for testing
2013-03-28 16:27:39 -07:00
001ed7626b
Fix md5sum mismatch on google breakpad on windows
2013-03-28 12:53:55 -05:00
48f433212f
Fix breakpad breakage from linux API diffs
2013-03-27 23:18:14 -07:00
f0c2f99c25
New gmock with WChar fix and add boost sys lib to viewer source tests
2013-03-27 19:09:01 -07:00
0ebfcce8ff
Update to newest breakpad candidate packages with fixed headers
2013-03-27 14:34:10 -07:00
a83289f01f
Fix API diffs with new breakpad and point at private breakpad packages to test
2013-03-27 05:50:55 -07:00
ae9604acd5
Backed out changeset: 3643d1c655c0
2013-03-26 12:32:29 -05:00
b9db8d4813
Fix linux breakpad package URL
2013-03-26 09:26:24 -07:00
0560a8c457
Point at private breakpad packages to get builds working again
2013-03-26 09:16:22 -07:00
34181d1566
BUILDFIX new appearance utility src for fixing a runtime error
2013-03-18 11:36:37 -04:00
27b01e94dd
MAINT-2389: pick up new Boost build to eliminate gcc 4.1 warnings
2013-02-21 19:51:33 -05:00
54e2d2b000
MAINT-2389: Change viewer to Boost package without ucontext.h.
...
In autobuild.xml, specify today's build of the Boost package that includes the
Boost.Context library, and whose boost::dcoroutines library uses Boost.Context
exclusively instead of its previous context-switching underpinnings (source of
the ucontext.h dependency).
Add BOOST_CONTEXT_LIBRARY to Boost.cmake and Copy3rdPartyLibs.cmake. Link it
with the viewer and with the lllogin.cpp test executable.
Track new Boost package convention that our (early, unofficial) Boost.Coroutine
library is now accessed as boost/dcoroutine/etc.h and boost::dcoroutines::etc.
Remove #include <boost/coroutine/coroutine.hpp> from
llviewerprecompiledheaders.h and lllogin.cpp: old rule that Boost.Coroutine
header must be #included before anything else that might use ucontext.h is
gone now that we no longer depend on ucontext.h. In fact remove
-D_XOPEN_SOURCE in 00-Common.cmake because that was inserted specifically to
work around a known problem with the ucontext.h facilities.
2013-02-21 01:13:24 -05:00
429d8250dd
Updating appearance utility
2013-02-19 23:05:31 +00:00
669d1295a3
Added ca-bundle.crt behaviors for Mac and Windows.
2013-02-15 17:05:01 -08:00
973e39608a
Updated to use 4.5SDKs for Mac and Windows. Tricked into believing 3.2 SDK is 4.5 for linux
2013-02-16 01:02:20 +00:00
be21b989c5
Updating appearance util
2013-02-11 19:52:07 +00:00
93f07d4e27
Updating appearance utility
2013-02-09 01:18:36 +00:00
b342b96b3a
Updating appearance utility
2013-02-09 00:43:56 +00:00
aed2e90312
Update fmodex sums to refer to newest OS X 3p-fmodex-private
2013-02-05 10:24:56 -08:00
cd2a6e756e
Update windows fmodex sums and path for new build
2013-02-05 09:50:44 -08:00
a6742f8e8d
Update fmodex sums for new builds
2013-02-04 19:57:52 -08:00
ace3891349
Point autobuild.xml at yet another 3p-fmodex-private OS X build.
2013-02-04 16:32:18 -08:00
efa7022c3a
Nix trying to copy the debug fmod DLL
2013-02-04 15:10:39 -08:00
b99b9133f4
Fixed double hash sum entry
2013-02-04 14:46:38 -08:00
c7d0a6d259
md5sum and path update redux
2013-02-04 14:44:29 -08:00
4c6fc784a6
Point autobuild at newer fmodex builds and fix warning being treated as error in llaudioengine_fmodex.cpp
2013-02-04 14:04:22 -08:00
0b614a6098
Fixed rev numbers in paths for mac and linux
2013-02-04 11:11:12 -08:00
c1ccf505b6
Fix autobuild.xml to refer to md5sums and paths of newer 3p-fmodex-private
2013-02-04 10:54:56 -08:00
fc59d25ec8
Merged
2013-02-04 13:08:25 -05:00
d5cafa98a3
Point autobuild at latest Mac Fmod Ex package
2013-02-04 09:32:50 -08:00
c074456a1e
Updated md5sums and staged lib paths for FModEx
2013-02-04 08:58:26 -08:00
5030766cf2
Correct order of autobuild libs
2013-02-04 21:36:12 +08:00
800dad3123
Merged callum_linden/viewer-development-usb-headset into default
2013-02-02 10:57:35 -05:00
d6130d68d5
Updated fmodex download paths / md5sums from proxy for the first TC builds
2013-02-02 00:23:08 -08:00
b0f2f02333
Removed (most) references to older FMOD library - still a little Linux clean up left
2013-02-01 08:44:52 -08:00
946d3bbcc6
SH-3651 FIX Beards not visible on server-generated appearances.
...
Fixed back end to enable beards.
2013-01-30 17:35:36 -05:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
9b86b8bf3d
Add in Windows FMOD Ex package
2013-01-23 15:57:38 -08:00
fa12377b0d
Update 3p libs to include debug version too
2013-01-22 15:55:31 -08:00
ba3e89b5c7
first push - patch from CmdCupCake plus force FMODEX on
2013-01-18 16:43:19 -08:00
06baa6bf9c
Moving appearance utility deb to private repo
2013-01-18 21:22:18 +00:00
954ebaed84
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
2013-01-08 13:40:59 -06:00
e1af26eaa2
Disabling build of headless appearance utility
2012-12-20 21:39:33 +00:00
1c7f19c865
change to use lindenlab repo for havok source, with new license
2012-12-19 09:45:28 -05:00
0ed83541bf
upgrade boost build to use public build of icu4c
2012-12-19 09:41:59 -05:00
8eef31e47a
Updating appearance utility to deal with IMG_INVISIBLE
2012-12-12 20:58:56 +00:00
531394df23
Updating linux libGLOD to match darwin naming
2012-12-12 00:34:40 +00:00
5798dd54cc
Fix for building on case-sensitive mac filesystems. Fix to remove unwind spam warnings while linking on xcode 4.5.2 builds
2012-12-11 13:56:50 -08:00
23d77d3a34
Automated merge
2012-12-06 22:56:21 +00:00
07d05c2967
Alpha rendering fixes for appearance utility.
2012-12-06 22:54:50 +00:00
32f5015ecd
Added back in mesa package for linux builds
2012-12-05 14:33:30 -05:00
7fe4fbe674
Pull in upstream viewer-development via viewer-lion
2012-12-04 15:03:34 -08:00
96ef49df75
Automated merge
2012-11-28 23:46:06 +00:00
dc71cae16b
Updating appearance utility
2012-11-28 23:45:23 +00:00
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
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
e66dacddfd
Update to Boost 1.52 package with gcc 4.1 warning fix.
2012-11-17 11:17:57 -05:00
12a3f2ea72
Use new 3p-boost 1.52 build with Windows /Zc:wchar_t- compile switch.
2012-11-16 07:08:17 -05:00
19e22ca030
Bumping appearance utility source
2012-11-15 00:18:16 +00:00
5a2c570485
Updating appearance utility package
2012-11-14 22:52:54 +00:00
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
92acb99f6f
Point autobuild at new Boost 1.52 third-party libs
2012-11-12 15:55:17 -08:00
85e03582b2
updating appearance utility package
2012-11-06 18:18:12 -05:00
27933214f4
Switching to system osmesa library instead of pre-packaged library
2012-10-24 18:19:22 +00:00
3ac3f76fc3
FIX: fixed broken baked texture rendering in lltexlayer, by enforcing correct gl state in lltexlayer.cpp
...
FIX: updated appearance utility source package
2012-10-19 21:49:26 +00:00
f974374789
Pulling in viewer-gcc4.6 freetype fixes
2012-10-13 01:39:41 +00:00
1709952adb
pull back 3.4.1-beta6 fixes
2012-10-10 21:40:10 -04:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
19e43e4b58
Added fast timers for baked texture rendering. Updated appearance utility
2012-10-06 08:08:52 +00:00
e858c172fc
Updating to newer build of tcmalloc/google perf tools. Removing X11 library dependencies from headless libraries
2012-10-04 22:00:24 +00:00
45f35966df
Fixing autobuild md5sum for mesa
2012-10-04 07:22:52 +00:00
8b8ea8908f
Updating appearance utility
2012-10-04 06:33:41 +00:00
c9ab9590aa
Removing server-related cmake cruft. Fixing libGLU warnings on linux.
2012-10-04 03:12:48 +00:00
fe52f09952
Updating appearance utility
2012-10-02 10:17:10 +00:00
358b0ca5ff
Updating appearance utility version
2012-10-02 01:06:34 +00:00
5010cf72d3
Updating appearance utility version
2012-09-30 09:22:22 +00:00
0a94b5bb39
Exposing more tex layer information for hash id generation
2012-09-28 23:56:55 +00:00
f9a5cdba50
Started stubbing out llsd support for tex layer information.
2012-09-28 01:06:17 +00:00
3844f4328b
Updating appearance utility src, with fixed merge
2012-09-27 22:10:26 +00:00
09ee906f23
Updating appearance utility source package
2012-09-27 17:19:17 -04:00
637fb26dd8
Updating appearance utility source
2012-09-27 20:31:09 +00:00
4f93192e7d
Fix for mac/linux 'ruth' appearance. Fix for linux build issue
2012-09-27 00:38:52 +00:00
d3924200b6
Removing unused gHeadlessClient code from viewer
2012-09-23 03:06:11 +00:00
6ec47d8c31
Updating appearance utility source version
2012-09-22 18:25:54 +00:00
Brad Payne (Vir Linden)