Oz Linden
|
9c313aea13
|
merge changes for DRTVWR-336
|
2013-10-15 17:47:37 -04:00 |
|
Merov Linden
|
1e32b9dd33
|
Pull merge of lindenlab/viewer-release
|
2013-10-04 09:47:26 -07:00 |
|
Gilbert Gonzales
|
a8d5b070b0
|
merging viewer release
|
2013-08-22 14:58:10 -07:00 |
|
Oz Linden
|
c42a91421f
|
merge changes for 3.6.3-release
|
2013-08-20 10:37:10 -04:00 |
|
Dave Parks
|
79029149a4
|
Automated merge with file:///F:%5Cviewer-bear
|
2013-06-21 12:51:29 -05:00 |
|
Dave Parks
|
9ea2d90a0d
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-06-20 12:10:26 -05:00 |
|
Oz Linden
|
1108cd0e5c
|
merge changes for 3.6.0-release
|
2013-06-19 17:56:43 -04:00 |
|
Merov Linden
|
7da4c65191
|
Pull merge from lindenlab/viewer-release
|
2013-06-19 14:06:06 -07:00 |
|
Oz Linden
|
2268bf3833
|
merge changes for 3.5.3-release
|
2013-06-13 15:28:13 -04:00 |
|
Graham Madarasz
|
c38204f5e0
|
Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat
|
2013-06-05 14:26:27 -07:00 |
|
Graham Madarasz
|
ea24612561
|
BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid throwing unhandlable exceptions in coroutines in RelWithDebInfo builds
|
2013-06-04 07:51:27 -07:00 |
|
Graham Madarasz
|
d7e76ed642
|
BUG-2707 more logging crash hunting
|
2013-06-03 14:23:51 -07:00 |
|
Graham Madarasz
|
6b2266e9fb
|
BUG-2707 first learn fly, then learn kick; moved setup of listener to after Area init is complete and made the coro that rewrites URIs do less work on the stack
|
2013-05-30 09:46:12 -07:00 |
|
Graham Madarasz
|
7931cac194
|
MATBUG-126 BUG-2707 speculative fix for login crasher based on stack from Kat
|
2013-05-30 06:39:43 -07:00 |
|
Merov Linden
|
1c740dfb51
|
Pull merge from viewer-release
|
2013-05-22 14:21:49 -07:00 |
|
simon
|
ee2fce8790
|
Merge downstream code and viewer-beta
|
2013-05-09 14:10:45 -07:00 |
|
simon
|
8895e79576
|
Merge downstream code / viewer-beta
|
2013-05-09 13:21:22 -07:00 |
|
Don Kjer
|
3a351c4ee5
|
Adding follow_redirects parameter to LLHTTPClient get/head variants. Not following redirects for facebook connect requests.
|
2013-05-08 05:51:28 +00:00 |
|
Graham Madarasz
|
025c890958
|
Merge vwr-dev-mat
|
2013-05-01 08:11:15 -07:00 |
|
Graham Madarasz
|
806d09b114
|
Merge 3.5.1 into Materials
|
2013-04-30 19:50:05 -07:00 |
|
simon
|
6e483af1f6
|
Revert ares and libcurl version update that was causing problems, revise curl
handle duplication code. Reviewed by Kelly
|
2013-04-25 14:14:35 -07:00 |
|
Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
simon
|
b42b789723
|
Merge in downstream code (chui fixes, materials)
|
2013-04-11 16:18:34 -07:00 |
|
simon
|
c7bab8ab8b
|
Merge
|
2013-04-11 16:04:21 -07:00 |
|
simon
|
9c371c1209
|
Clean up transfer manager code and log messages. Reviewed by Kelly
|
2013-04-11 13:27:11 -07:00 |
|
Nyx Linden
|
7ea7b236d8
|
BUILDFIX commit policy fixes
|
2013-04-02 18:32:57 -04:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
simon
|
a976f5c217
|
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
|
2013-03-25 12:19:02 -07:00 |
|
Simon Linden
|
d5561a1ada
|
Merge in viewer-beta to get CHUI code
|
2013-03-19 16:20:53 -07:00 |
|
Oz Linden
|
ed7785bf97
|
merge up to 3.5.0-beta3 (chui)
|
2013-03-18 14:30:57 -04:00 |
|
Dave Parks
|
e95563e10d
|
MAINT-2410 Remove unused particle packing code and fix integration test to work without a packer.
|
2013-03-13 21:08:17 -05:00 |
|
Dave Parks
|
9a7a19c77a
|
Merge
|
2013-03-13 17:13:45 -05:00 |
|
Dave Parks
|
08ae21f52d
|
MAINT-2410 Extra Particle Parameters -- viewer implementation
Reviewed by Kelly and Graham
|
2013-03-13 17:07:22 -05:00 |
|
Brad Payne (Vir Linden)
|
45838b8b07
|
fix for build failure
|
2013-03-13 11:19:21 -04:00 |
|
Don Kjer
|
7405554290
|
Fixed potential memory leak in LLHTTPClient. Fixed potential hanging http requests in LLHTTPClient. Fixed munging of "Pragma" headers in LLHTTPClientAdapter
|
2013-03-13 08:49:26 +00:00 |
|
Graham Madarasz
|
e8b8a12b73
|
Mods to make compile on gcc 4.6.3 work mo betta
|
2013-03-12 10:48:05 -07:00 |
|
prep
|
8e3b190e91
|
merge
|
2013-03-11 15:17:13 -04:00 |
|
prep
|
e0c9174609
|
merge
|
2013-03-11 15:05:47 -04:00 |
|
prep
|
207d9fd767
|
Viewer-chui merge
|
2013-03-11 14:45:53 -04:00 |
|
Dave Parks
|
7a71c094b9
|
MAINT-2410 Extra Particle Parameters -- port of Kelly's simulator changeset
|
2013-03-08 18:12:19 -06:00 |
|
Don Kjer
|
54cdc322b8
|
Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
|
2013-03-05 22:05:22 -08:00 |
|
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
|
96dc947784
|
MAINT-2347 Change connect timeout to 30 seconds and request timeout to 4 minutes
|
2013-02-11 17:32:53 -06:00 |
|
Merov Linden
|
faae38daaa
|
Pull merge from lindenlab/viewer-developement
|
2013-01-30 20:01:03 -08:00 |
|
Nyx Linden
|
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 |
|
Oz Linden
|
3e3fda589b
|
merge up to 3.4.4-release
|
2013-01-18 16:37:07 -05:00 |
|
Jonathan Yap
|
e386aa73b7
|
STORM-1838
|
2013-01-11 11:13:44 -05:00 |
|
Merov Linden
|
573ab07a40
|
Merge pull from lindenlab/viewer-beta
|
2013-01-10 14:51:59 -08:00 |
|
Baker Linden
|
c4a1bd1c2f
|
viewer-development merge
|
2013-01-09 15:25:06 -08:00 |
|
Baker Linden
|
b0c449d301
|
[MAINT-2185] Unable to upload terrain .raw files
- Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path)
|
2013-01-09 15:24:27 -08:00 |