Commit Graph

117 Commits (fc971a2c8fb701e07825e1f0abb2c720d40e0bf2)

Author SHA1 Message Date
Ansariel cc32221af7 Remove one of the XML filepicker types for Mac that doesn't need to be there anymore 2015-01-20 19:59:49 +01:00
Tonya Souther e6130ff458 Compile fix for OS X. 2015-01-20 12:44:15 -06:00
Ansariel 99cbf150a0 Merge LL V3.7.21 2015-01-15 13:55:17 +01:00
Ansariel 1f465086c0 Merge LL V3.7.10 2015-01-11 18:40:22 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02: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
Tank_Master dc353c205a Merge 2014-06-10 20:27:31 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -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
Cinders 195d6998f7 Remove unused add_csv_filter_to_gtkchooser() function completely 2013-12-08 17:03:14 -07:00
Nicky 60cec9a2ba More Linux build fixing. 2013-12-09 00:21:41 +01:00
Ansariel d997da9346 Linux build fix 2013-12-09 00:04:31 +01:00
Cinders 95f518746a FIRE-12276: Group membership export to csv 2013-12-08 08:52:29 -07:00
Cinders 41e32c8515 Whitespace cleanup 2013-11-23 22:33:56 -07:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08: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
Cinders 484c0d7ac9 Add missing filters for darwin filepicker 2013-11-04 19:42:56 -07:00
Nicky 1ddec81e0a FIRE-11793/BUG-4053/MAINT-3262 Cannot select image to upload to Web profile. This is because anding F_NAV_SUPPORT clears F_FILE. Whereas in fact we want both (OR). 2013-10-04 01:23:23 +02:00
Cinders d41651f829 Remove now unused function 2013-09-20 04:59:13 -06:00
Cinders c6e89f4880 Oops, fix a break in FFSAVE_COLLADA that was lost in the 3.6.5 merge 2013-09-19 22:23:22 -06:00
Cinders fd37f371ac Small fixes to import filters 2013-09-19 21:57:30 -06:00
Cinders 4f09d71bd8 Clean up my sloppy commit and fixes to threaded file pickers 2013-09-10 16:28:36 -06:00
Cinders 5d72fa20b7 Fix for BUG-3838 - send_agent_resume() not called after snapshot 2013-09-10 16:02:53 -06:00