Commit Graph

258 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
callum_linden 745151936e Update to build on Xcode 6.0 (fix unit tests): fix up Boost linker errors 2014-10-22 10:09:24 -07:00
Monty Brandenberg 903729d5c9 Merge. Refresh from viewer-release after 3.7.9 release. 2014-06-16 16:41:52 -04:00
Monty Brandenberg 060c728970 Merge. Pull in viewer-release after release of 3.7.8 2014-05-22 22:08:54 +00:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Monty Brandenberg 1422f89612 Linux: Finish new Boost dependencies to get Linux building again. 2014-04-04 21:59:15 +00:00
Monty Brandenberg 469438707d Library updates and switch to 3d-llqtwebkit2 build products.
SDL to 1.2.15, c-ares to latest 1.10.0 build, Boost to 1.55.0
with coroutine updates/fixes, curl to 7.34.0, libpng to 1.6.8,
openssl to 1.0.1e, zlib to latest 1.2.8 build, llqtwebkit
built from 4.7.1 sources refactored and tested in 3p-llqtwebkit2
repository.

Windows is functional with a good number of warning messages
at runtime from libpng and KDU.  MoaP/slplugin functioning.
2014-04-04 16:30:50 -04:00
Brad Payne (Vir Linden) e896c19cc1 merge 2013-12-10 10:12:01 -05:00
Richard Linden 24b7fd1c7f merge with release 2013-12-09 11:55:02 -08:00
Brad Payne (Vir Linden) 744cf6be8d merge 2013-12-05 10:39:35 -05:00
Nat Goodspeed a55f88109f MAINT-3489: Gracefully handle missing downloaded installer file.
If a marker file indicates that an installer has been downloaded and verified
and is ready to install, but that installer file does not exist, log it and
revert to checking for update.
Also add logging to every code path that can remove the installer explicitly,
in case the missing installer is actually being killed off by some weird
sequence of state-machine transitions.
2013-11-26 17:18:28 -05:00
Nat Goodspeed 9e986201ba MAINT-3489: Make Mac updater script detect prematurely deleted .dmg.
Also, delete it when done.
2013-11-26 09:25:10 -05:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -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
Nat Goodspeed 57040ea70e Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331 2013-10-28 20:06:18 -04:00
Nat Goodspeed 8881b47d22 MAINT-3331: On update, remove com.secondlife.indra.viewer.savedState. 2013-10-22 01:35:01 -04:00
Oz Linden 9c313aea13 merge changes for DRTVWR-336 2013-10-15 17:47:37 -04:00
Brad Payne (Vir Linden) e6a68e1f09 merge 2013-09-10 15:30:13 -04:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Brad Payne (Vir Linden) 144eb1912d merge 2013-09-04 13:41:51 -04:00
Oz Linden a359d9d80c merge changes for 3.6.4-release 2013-08-27 10:37:02 -04:00
Oz Linden a4e7444985 correct merge error in llupdatechecker.cpp 2013-08-26 16:43:03 -04:00
Oz Linden 7ca10e5161 merge changes for 3.6.4-release 2013-08-26 15:14:12 -04:00
Nyx Linden 5ae117aff6 merge with viewer-release 2013-08-16 19:31:16 -04:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Oz Linden d0432d4d4c CHOP-975: Remove fallback to v1.0 update query when the v1.1 gets a 404 response 2013-07-30 11:53:47 -04:00
Oz Linden 2be8585baa merge changes for DRTVWR-325 2013-07-15 16:55:27 -04:00
Oz Linden 3e6ce2dbad add some validation of update response before starting download 2013-07-13 15:04:18 -04:00
Oz Linden 34c77159f7 CHOP-963: Make update service query url depend on the grid rather than settings 2013-07-09 08:39:22 -07:00
Geenz 9c83d4b5b8 Merge with viewer-release. 2013-06-19 15:47:57 -04:00
Nat Goodspeed aa8abe5e1c Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2013-06-19 12:43:50 -04:00
Geenz 0af636e632 Merged with viewer-release 2013-06-17 04:39:47 -04:00
Nat Goodspeed 2b8cd2fccf MAINT-2333: Use bouncing progress bar for Linux updater message.
This eliminates the user expectation that s/he must click OK before the
updater will begin installing the new viewer.
2013-06-11 19:23:38 -04:00
Graham Madarasz 50689a13ba BOOG2707 uncomment cleared suspects 2013-06-05 06:14: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 842a6c6e46 BUG-2707 disable more login/update-sequence specific logging 2013-06-02 14:41:57 -07:00
Brad Payne (Vir Linden) b0303445f1 more merge fixing 2013-05-21 16:56:45 -04:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Geenz 3779e51bfc Merged with https://bitbucket.org/lindenlab/viewer-beta 2013-05-13 22:22:51 -04:00
Oz Linden fc4a6431c9 CHOP-942: fix crash if update check times out 2013-05-13 16:28:50 -04:00
Oz Linden 545e033d1e merge changes for DRTVWR-299 2013-05-07 15:11:55 -04:00
Oz Linden 3bb708d706 merge up to latest viewer-development for merge to 3.5.2 2013-04-19 14:42:56 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Oz Linden 327c99cadb merge up to 3.5.2 development 2013-04-16 16:01:32 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Don Kjer 662d67e3b5 Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures 2013-03-13 08:46:59 +00:00
Don Kjer f945415210 Large changes to the LLCurl::Responder API, as well as pulling in some changes to common libraries from the server codebase:
* Additional error checking in http handlers.
* Uniform log spam for http errors.
* Switch to using constants for http heads and status codes.
* Fixed bugs in incorrectly checking if parsing LLSD xml resulted in an error.
* Reduced spam regarding LLSD parsing errors in the default completedRaw http handler.  It should not longer be necessary to short-circuit completedRaw to avoid spam.
* Ported over a few bug fixes from the server code.
* Switch mode http status codes to use S32 instead of U32.
* Ported LLSD::asStringRef from server code; avoids copying strings all over the place.
* Ported server change to LLSD::asBinary; this always returns a reference now instead of copying the entire binary blob.
* Ported server pretty notation format (and pretty binary format) to llsd serialization.

* The new LLCurl::Responder API no longer has two error handlers to choose from.  Overriding the following methods have been deprecated:
** error - use httpFailure
** errorWithContent - use httpFailure
** result - use httpSuccess
** completed - use httpCompleted
** completedHeader - no longer necessary; call getResponseHeaders() from a completion method to obtain these headers.

* In order to 'catch' a completed http request, override one of these methods:
** httpSuccess - Called for any 2xx status code.
** httpFailure - Called for any non-2xx status code.
** httpComplete - Called for all status codes.  Default implementation is to call either httpSuccess or httpFailure.
* It is recommended to keep these methods protected/private in order to avoid triggering of these methods without using a 'push' method (see below).

* Uniform error handling should followed whenever possible by calling a variant of this during httpFailure:
** llwarns << dumpResponse() << llendl;
* Be sure to include LOG_CLASS(your_class_name) in your class in order for the log entry to give more context.

* In order to 'push' a result into the responder, you should no longer call error, errorWithContent, result, or completed.
* Nor should you directly call httpSuccess/Failure/Completed (unless passing a message up to a parent class).
* Instead, you can set the internal content of a responder and trigger a corresponding method using the following methods:
** successResult - Sets results and calls httpSuccess
** failureResult - Sets results and calls httpFailure
** completedResult - Sets results and calls httpCompleted

* To obtain information about a the response from a reponder method, use the following getters:
** getStatus - HTTP status code
** getReason - Reason string
** getContent - Content (Parsed body LLSD)
** getResponseHeaders - Response Headers (LLSD map)
** getHTTPMethod - HTTP method of the request
** getURL - URL of the request

* It is still possible to override completeRaw if you want to manipulate data directly out of LLPumpIO.

* See indra/llmessage/llcurl.h for more information.
2013-03-13 06:26:25 +00:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Graham Madarasz (Graham Linden) 98e02a5d76 Merge new boost and add OS X 10.8 mods 2013-02-22 09:49:58 -08:00
Nat Goodspeed d8ce2ec0a0 MAINT-2389: Tell CMake viewer_components/login depends on Boost.Context
This addresses a Linux link failure due to the Linux linker making a single
left-to-right pass through libraries.
2013-02-21 18:57:24 -05:00