summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertos.cpp
AgeCommit message (Collapse)Author
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2017-11-29DRTVWR-418: Merge from latest viewer-releaseNat Goodspeed
2017-10-17MAINT-7592 Fixed the checkbox/label behaviorAndreyL ProductEngine
2017-07-12Fixes for: 'MAINT-7588 Viewer takes 3 to 5 seconds to load TOS and styling ↵Callum Prentice
different on redirecting page' and 'MAINT-7599 Reformat ToS 'Accept' label as a single string'. The former's load time is improved by only asking for the HTTP header to check site is alive and then applying a specific CSS style to the page instead of relying on the CEF default (which appears to change often). The latter replaces the XUI checkbox label with a text box and adjusts it visually as necessary for enabled/disabled states
2016-04-04merge with 4.0.3-releaseOz Linden
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-12-18MergeRider Linden
2015-11-13MAINT-5862 Fix Provide a way for new Linux users to accept ToScallum_linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-23MAINT-5791: Change the way the TOS dialog is retrieved after the site-alive ↵Rider Linden
test coro. Use handles rather than findTypedInstance.
2015-10-22MAINT-5788: Do not call set active if TOS window closed before site alive ↵Rider Linden
test returns.
2015-10-19Merge from viewer release.Rider Linden
2015-09-18Set consistent terminology for yield/wait -> suspend for coroutines.Rider Linden
2015-07-23MAINT-5398 FIXED [BetaBreakers] TOS additional policy links cannot be ↵andreykproductengine
scrolled or closed once opened
2015-07-10Backed out changeset bab1000e1b2d: restore 'selfless' changesNat Goodspeed
2015-07-07Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5Rider Linden
2015-07-01MAINT-5351: Remove 'self' parameter from coroutine functions.Nat Goodspeed
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest builds clean, but the resulting viewer is as yet untested.
2015-06-03Remove vestigial httpclient.h include from files that no longer need it.Rider Linden
2015-06-03TOS retrieval to coroutineRider Linden
2014-10-18Update to build on Xcode 6.0: remove more of unused variablescallum_linden
2013-05-21mergeBrad Payne (Vir Linden)
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-13Large changes to the LLCurl::Responder API, as well as pulling in some ↵Don Kjer
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.
2012-10-03Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix ↵Dave Parks
out-of-order deletion of LLTextureFetch on shutdown
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-04-13Supplementary fix for EXT-6663 TOS Screen logic for enabling agreement ↵Aimee Linden
checkbox is questionable If the "alive" check on the ToS page returns before the browser plugin has loaded the Loading page, the checkbox never gets enabled, so postpone the check until the Loading page is up.
2010-04-02Fix for EXT-6663 (TOS Screen logic for enabling agreement checkbox is ↵Monroe Linden
questionable) * remove the use of the start_url parameter, and instead store the loading url as a string in the xui, so that there's no chance of the loading screen page completing before we add our observer. * replace the "load complete count" with explicit state variables for whether the loading screen has completed and whether the site is alive * don't begin trying to load the real URL until both of the above conditions are met (and begin the load no matter which order they are satisfied in) Reviewed by Richard at http://codereview.lindenlab.com/1218007
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24Removed include llnotifications.h from llfloater.h trying to speed buildsJames Cook
Fixed many other includes related to this file. Cleaned out llfloatertestlistview to be an empty test floater.
2009-09-11QAR-1619: Reconcile LLFloaterTOS::onCancel() with viewer-2 version.Nat Goodspeed
The viewer-2 onCancel() pops up a "MustAgreeToLogIn" notification. Make ours do the same.
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-08-28DEV-38942 Eliminate startModal() from LLModalDialogSteven Bennetts
Also moved TOS and Critical floaters to login debug menu for testing
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 ↵brad kittenbrink
merge (r131929). Some minor post-merge cleanups still required.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-26svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-11Better solution for fixing up the LLFloaterTOS callback after the last ↵brad kittenbrink
viewer-2.0.0-3 merge. LLFloaterTOS and LLLoginInstance now communicate through an event pump "lllogininstance_tos_callback". reviewed by Mani.
2009-08-06Merged in partial rollback of LLFloaterTOS post-merge fixes.brad kittenbrink
2009-08-06Backed out changeset bfb246df4655: rolling back LLFloaterTOS post-merge ↵brad kittenbrink
fixups because they didn't work on linux.
2009-08-05Fixups after the latest merge with viewer-2.0.0-3. Updated LLLoginInstance ↵brad kittenbrink
to use the new LLFloaterReg way of getting hold of floaters.
2009-08-04Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs ↵brad kittenbrink
some post-merge cleanup.
2009-08-04svn merge -r 128442:129343 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-07-22Adding LLLoginInstance unit testMark Palange (Mani)