Oz Linden
|
e15002a11c
|
merge changes for 3.7.9-release
|
2014-06-16 11:42:37 -04:00 |
|
Nyx Linden
|
d0d32626a5
|
merge fix for merge with project interesting. New appearance utility source and one quick doubly-declared typedef.
|
2014-05-19 14:44:01 -04:00 |
|
Brad Payne (Vir Linden)
|
7b9708a2e3
|
sunshine-external merge WIP
|
2014-05-13 10:02:26 -04:00 |
|
Oz Linden
|
a98b4b6bee
|
merge changes for 3.7.7-release
|
2014-05-07 11:09:04 -04:00 |
|
Xiaohong Bao
|
ae564140c0
|
Merge
|
2014-04-22 12:19:28 -06:00 |
|
Oz Linden
|
b4ca93cadc
|
merge up to 3.7.6-release
|
2014-04-22 13:05:26 -04:00 |
|
Brad Payne (Vir Linden)
|
d0eb9658f2
|
merge
|
2014-04-22 11:19:58 -04:00 |
|
Brad Payne (Vir Linden)
|
ea7f34d37a
|
merge
|
2014-04-08 13:20:23 -04:00 |
|
Oz Linden
|
375c05ac43
|
merge changes for 3.7.5-release
|
2014-04-08 11:41:12 -04:00 |
|
Richard Linden
|
98aabdc176
|
merge with release
|
2014-04-07 19:09:40 -07:00 |
|
Aura Linden
|
d476b12ae5
|
Merged viewer release into vivox
|
2014-04-07 17:04:09 -07:00 |
|
Brad Payne (Vir Linden)
|
d10ecef615
|
merge
|
2014-03-31 11:59:11 -04:00 |
|
Aura Linden
|
dfd78e83d9
|
Pulled merge from release
|
2014-03-27 11:59:35 -07:00 |
|
Richard Linden
|
e5bbdafded
|
merge with release
|
2014-03-24 19:23:34 -07:00 |
|
Aura Linden
|
77ec712b15
|
Merged in viewer-release.
|
2014-03-24 11:30:17 -07:00 |
|
Monty Brandenberg
|
1e764fb668
|
Consistent set of fmodex 4.44.31 builds now.
|
2014-03-14 21:14:32 -04:00 |
|
Monty Brandenberg
|
4f565ed077
|
Update fmodex to 4.44.31. Move DSP descriptor to heap storage.
|
2014-03-14 19:48:35 -04:00 |
|
Aura Linden
|
22ea5ac41c
|
BUG-4260 Updated to 4.6.x vivox libraries for Mac and Windows.
|
2014-02-26 20:15:45 -08:00 |
|
Oz Linden
|
1d30fe9554
|
merge changes for 3.7.2-release
|
2014-02-25 13:31:01 -05:00 |
|
Brad Payne (Vir Linden)
|
895d52a399
|
merge viewer-release to sunshine-external
|
2014-02-25 13:25:40 -05:00 |
|
Richard Linden
|
80b4a4a1f5
|
merge with release
|
2014-02-24 18:45:59 -08:00 |
|
obscurestar
|
8fd270af1c
|
Pulled from release.
|
2014-02-24 15:12:04 -08:00 |
|
Aura Linden
|
6809348125
|
Creating a cleaner branch
|
2013-12-03 17:06:06 -08:00 |
|
Oz Linden
|
7f39d0472e
|
merge changes for STORM-1831
|
2013-11-18 13:51:24 -05:00 |
|
Monty Brandenberg
|
d191585a3e
|
Merge. Refresh from viewer-release after 3.6.10 release
|
2013-11-12 14:06:38 -05:00 |
|
Richard Linden
|
33e0a1b57f
|
updated autobuild llappearanceutilitysource to point to official build
|
2013-11-08 21:18:29 -08:00 |
|
Richard Linden
|
fe518bde8e
|
merge with release
|
2013-11-06 17:22:04 -08:00 |
|
Don Kjer
|
7866356d77
|
Merge viewer-release => sunshine-internal
|
2013-10-29 13:20:18 +00:00 |
|
Nyx Linden
|
b1838f02bc
|
SH-4572 FIX changing clothing parameters do not take effect in edit appearance
fix, new back-end utility and restoring the necessary functionality.
|
2013-10-25 16:43:36 -04:00 |
|
Richard Linden
|
ab43be5ddb
|
moved some common functionality from LLTrace::BlockTimerStatHandle to BlockTimer
updates appearance utility dependency
|
2013-10-23 13:24:47 -07:00 |
|
Richard Linden
|
e06ad3d60f
|
updated appearance utility dependency
|
2013-10-23 09:49:29 -07:00 |
|
Ima Mechanique
|
30f835809b
|
Merge 3.5.8-release
|
2013-10-21 04:21:00 +01:00 |
|
Ima Mechanique
|
4027486dbb
|
storm-1831 Incorporating Oz's changes to update libxml on linux to libxml2
|
2013-10-18 17:38:31 +01:00 |
|
Nyx Linden
|
b42c70173c
|
SH-3455 BUILDFIX Updating linux appearance utility to use the new refactor
Eliminated some unnecessary functions that the refactor took care of,
linux build should be fixed.
|
2013-10-16 15:28:10 -04:00 |
|
Brad Payne (Vir Linden)
|
1f8b37e9ad
|
merge
|
2013-10-16 11:52:43 -04:00 |
|
Oz Linden
|
9c313aea13
|
merge changes for DRTVWR-336
|
2013-10-15 17:47:37 -04:00 |
|
Ima Mechanique
|
015597bb58
|
STORM-1831 Importing Oz's updates for libxml2
|
2013-10-12 03:07:22 +01:00 |
|
Richard Linden
|
59628d6f85
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-10-01 14:28:39 -07:00 |
|
Monty Brandenberg
|
eaef5e63d5
|
Merge. Pull in viewer-release after materials viewer release.
|
2013-09-19 13:13:37 -04:00 |
|
Richard Linden
|
91850b6cfa
|
updated autobuild reference to llappearance-utility
|
2013-09-09 16:28:44 -07:00 |
|
Oz Linden
|
8dc273b942
|
correct some doc strings in the autobuild config file
|
2013-09-05 15:18:58 -04:00 |
|
Monty Brandenberg
|
f00b6c7133
|
Merge. Pull in viewer-release after SSA merge.
|
2013-08-26 18:54:39 -04:00 |
|
Monty Brandenberg
|
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 |
|
Monty Brandenberg
|
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 |
|
Richard Linden
|
cb8c94cc88
|
updated appearance utility source
|
2013-08-23 16:27:39 -07:00 |
|
Richard Linden
|
0d1850ef0b
|
updated appearance utility source
|
2013-08-23 15:53:18 -07:00 |
|
Monty Brandenberg
|
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 |
|
Xiaohong Bao
|
d8c02bf062
|
Merge
|
2013-08-19 16:09:28 -06:00 |
|
Nyx Linden
|
cc999b225e
|
merge cleanup, making sure our branch has the latest autobuild changes.
|
2013-08-19 11:55:49 -04:00 |
|
Nyx Linden
|
faa0866ca3
|
SH-4401 FIX back-end changes to handle new visual param groups.
|
2013-08-08 13:21:18 -04:00 |