Commit Graph

102 Commits (94ac0064354594de8adbb99084029c8b4027b2f6)

Author SHA1 Message Date
andreykproductengine 73c1e41ae5 MAINT-4301 FIXED failed script upload makes the wait cursor stick 2014-10-14 19:59:18 +03:00
Brad Payne (Vir Linden) 487ca1bad3 v-r -> s-e merge WIP 2014-05-14 17:50:59 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Brad Payne (Vir Linden) 48bc05e93f SH-3455 WIP - removing bake upload code 2013-09-19 16:14:59 -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
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -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
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
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
Dave Parks 374f20edf0 Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix out-of-order deletion of LLTextureFetch on shutdown 2012-10-03 14:30:21 -05:00
Don Kjer 204be2ba52 Split LLTexLayerSetBuffer into llappearance portion, and viewer-specific LLViewerTexLayerSetBuffer 2012-09-04 15:18:15 +00:00
Don Kjer c355fb98d3 Extracted texture baking system into llappearance library. 2012-09-03 06:12:50 +00:00
Vadim ProductEngine bd0bd119c0 EXP-1594 FIXED Stop the upload progress indicator if inventory texture upoload fails. 2011-11-16 20:07:55 +02:00
Vadim ProductEngine 41e6455f74 STORM-1580 WIP Updated texture upload progress according to the spec.
By the way, fixed displaying upload cost.
2011-11-03 18:03:36 +02:00
Leyla Farazha 10ec004912 merge from viewer-experience 2011-08-12 14:53:25 -07:00
Brad Payne (Vir Linden) dd3069127b merge 2011-07-13 14:57:23 -04:00
Oz Linden 7b9fc42941 merge changes for storm-1325 2011-07-11 16:49:29 -04:00
Brad Payne (Vir Linden) 3cca342ffb SH-1790 FIX - use the inventory flags returned by server when available 2011-07-01 17:31:53 -04:00
Thickbrick Sleaford 1a44e5b3e9 FIX STORM-1325 Retry bake uploads in case of upload failure 2011-06-15 21:19:12 +03:00
Seraph Linden 69391625eb SH-1677 FIXED [REGRESSION] Bulk uploads do not adhere to default permissions
no idea how this ever worked before, as the code since 1.23 has been using the wrong keyword ("everyone_mask" instead of "new_everyone_mask").  I suspect something changed on the sim side?
2011-05-30 13:53:49 -04:00
Loren Shih fdf19a5268 Automated merge up from viewer-development 2011-01-10 11:20:39 -05:00
Coaldust Numbers 8cfea0bab1 VWR-1095 fix for problems with uploads following bulk upload failure
de minimus contribution accepted without CA - Oz Linden
2011-01-07 15:08:42 -05:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks fae96a240a Missed a file from last commit. 2010-09-28 13:52:53 -05:00
Dave Parks 613894c8cc SH-238 Add check boxes to upload skin weights (or not) and/or joint positions (or not).
Remove llfloaterimportcollada

Reviewed by Prep.
2010-09-28 13:45:42 -05:00
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
Dave Parks cf09d6c58a Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater. 2010-09-22 03:04:21 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden f8c91bad6b merge backout. 2010-06-15 14:48:31 +01:00
Tofu Linden f4b7164752 Backed out changeset 1c66b34b7fbe 2010-06-15 14:48:14 +01:00
Dave Parks f9b13d8f85 Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes. 2010-06-10 00:45:48 -05:00
Dave Parks f461ae214c Merge with render-pipeline 2010-06-07 23:05:22 -05:00
Callum Prentice d84990307b VI-65 - Addition of Quick/Eazy Buy Web based floater.
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency'
Reviewed by Sam/Richard
2010-05-21 15:22:32 -07:00
Tofu Linden 1dade05ee7 YET another hairy merge from viewer-trunk. Conflicts resolved... so far. 2010-04-06 16:10:16 +01:00
Loren Shih 2eba9819df EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h

Change made to simulator files as well.
2010-04-05 15:02:36 -04:00
Tofu Linden 61774546f0 HUGE merge from viewer-trunk. Many conflicts resolved. 2010-03-30 13:15:36 +01:00
Brad Payne (Vir Linden) b2a667b722 For EXT-4666: changed LLGestureManager to LLGestureMgr throughout 2010-03-29 11:10:54 -04:00
Leyla Farazha da407e32fd Merge 2010-03-24 16:51:07 -07:00
Leyla Farazha 7480e06934 Hooked up Save As Profile Pic
reviewed by Richard CC# 167
2010-03-24 16:39:59 -07:00
Dave Parks 8424ceb20f merge 2010-03-20 16:59:41 -05:00
Sergei Litovchuk c74f870151 (EXT-5982) [FRAGMENTATION] L$ kaufen window (Buy L$)
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml

Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/56/

--HG--
branch : product-engine
2010-03-18 19:42:38 +02:00
Andrew Dyukov b3f305ae94 Implemented normal task EXT-5982([HARD CODED] on L$ kaufen window (Buy L$)).
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/33/

--HG--
branch : product-engine
2010-03-16 18:29:56 +02:00
Dave Parks 16a30929f9 Inventory now updates appropriately when using model uploader. 2010-03-05 13:17:31 -06:00
Dave Parks 3972ae18d1 Backed out changeset: 0e0f8b0b0fa8 2010-01-07 08:49:34 -06:00
Dave Parks 078278bf51 LLImportCollada no longer a singleton to prepare for subclassing. 2010-01-06 15:02:43 -06:00
Dave Parks 6aa71844a8 Merge with viewer-2-0 2009-12-18 13:24:29 -06:00
Alexei Arabadji 4fc7b91a79 implemented EXT-2323 “Get rid from obsolete notification widgets”;
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00