Commit Graph

98 Commits (07ff9a5d67cefdae1bc112b19947f7ba173c9dbb)

Author SHA1 Message Date
Andrey Lihatskiy 7140640b69 DRTVWR-580 Post-merge fix - unused code 2023-05-19 02:31:28 +03:00
Andrey Lihatskiy 4dcab10bf8 Merge branch 'main' into DRTVWR-580-maint-T
# Conflicts:
#	doc/contributions.txt
#	indra/llcharacter/llkeyframemotion.cpp
#	indra/newview/llfilepicker.cpp
2023-05-17 17:47:45 +03:00
Andrey Lihatskiy 7b2205d8f6 Merge branch 'main' into DRTVWR-580-maint-T 2023-03-30 00:39:12 +03:00
Andrey Lihatskiy 5217e6bfb7 Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
#	indra/cmake/CMakeLists.txt
#	indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-30 00:25:16 +03:00
Andrey Lihatskiy dca3c83cd9 Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/newview/CMakeLists.txt
2023-03-20 01:23:16 +02:00
Maxim Nikolenko fe21f3fdf1 SL-19252 Remove "#ifdef _CORY_TESTING" code 2023-02-23 11:58:17 +02:00
Andrey Kleshchev 6c54c9f8a9 Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llfilepicker.h
#	indra/newview/llfilepicker_mac.h
#	indra/newview/llfilepicker_mac.mm
2023-02-09 22:33:52 +02:00
Andrey Kleshchev 27080dc7f7 SL-18996 make MacOS picker dialogs modeless to avoid disconnects #2 2023-01-27 17:25:18 +02:00
Andrey Kleshchev 2398a28af6 SL-18996 [WIP] MacOS make picker dialogs non-modal to avoid disconnects #1 2023-01-27 17:25:18 +02:00
Rye Mutt 662dd44587 Fix leaks in mac filepicker code 2022-10-28 18:49:32 -04:00
Nicky 0319ed6611 Another instance where LLFilePicker::getSaveFile had the wrong number of arguments. 2022-04-18 17:05:31 +02:00
Nicky b532c2986b Add argument missing from implementation 2022-04-18 16:47:54 +02:00
Dave Houlton 7cd076c796 DRTVWR-510 remove all LL_SOLARIS conditionals 2020-10-08 17:16:22 -06:00
Mnikolenko ProductEngine b08065dafd SL-10155 FIXED [MAC] Mesh upload tries to upload folder instead of opening it 2018-12-19 18:39:59 +02:00
andreykproductengine 5219e6c455 MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute 2018-04-17 19:25:28 +03:00
andreykproductengine 629840e9a8 MAINT-1804 Fixed bulk upload failures due to non-ansi symbols in names 2017-11-22 16:48:54 +02:00
andreykproductengine fe49c1e8a5 MAINT-1139 Catch Windows crash on Saving snapshot 2017-05-26 15:11:37 +03:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Rider Linden fd27f0feb8 MAINT-5507: Include httpconstants in file picker for linux. 2015-09-16 09:09:55 -07:00
Cinder 19330025ba OPEN-268 - Add missing xml cases to file picker on linux and darwin 2014-08-31 06:17:57 -06:00
Merov Linden c4c8debfc2 Pull merge from lindenlab/viewer-release 2014-06-17 11:12:27 -07:00
Merov Linden 51865f4e94 Pull merge from lindenlab/viewer-release 2014-05-19 21:43:42 -07:00
Brad Payne (Vir Linden) 67051b26ba merge 2014-05-19 18:10:45 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Merov Linden 8dae4bc222 Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors 2014-05-06 18:21:04 -07:00
maxim@mnikolenko 930f407a1c MAINT-3642 FIXED Allow saving textures with extension “.tga” at the end of the name. 2014-01-24 12:12:43 +02:00
Mnikolenko ProductEngine a462c5f14b MAINT-3262 FIXED Allow uploading gif-images 2014-01-14 11:47:40 +02:00
Merov Linden be80b11d30 Fix FFLOAD_ALL issue in file picker, add FFLOAD_EXE to fix exe picking on Mac Cocoa 2013-12-18 11:12:46 -08:00
Brad Payne (Vir Linden) 744cf6be8d merge 2013-12-05 10:39:35 -05:00
Mnikolenko ProductEngine 21d9e524f6 MAINT-3262 FIXED Cannot select image to upload to Web profile 2013-12-05 12:51:36 +02:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Brad Payne (Vir Linden) 1f8b37e9ad merge 2013-10-16 11:52:43 -04:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Cinder Biscuits 5b7da1998a BUG-3848: send_agent_resume() was not being called after snapshot. 2013-09-10 22:12:18 +00: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
maxim@mnikolenko e4c43d6bed MAINT-3247 FIXED Check that gfilter is not NULL. 2013-10-04 13:43:45 +03:00
Graham Madarasz (Graham Linden) b8a1fd33f5 Try all you want multichar constant, but you'll never be a string to me! (fix mac build errors from 'curious' filepicker literals) 2013-09-26 10:12:33 -07:00
simon_linden d3625d0b67 Merge downstream code 2013-09-19 15:30:34 -07:00
simon_linden e2019e8a3b Merge downstream code with viewer-release 2013-09-09 16:17:16 -07:00
callum_linden 2503f825ec MAINT-2897 Need to be able to save textures from inventory as PNG 2013-08-14 15:50:37 -07:00
dmitrykproductengine be9d946375 MAINT-2897 MAINT-2897 Need to be able to save textures from inventory as PNG 2013-08-14 11:32:23 +03: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
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 ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07: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