Commit Graph

87 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
simon 592024b580 Merge viewer-release and become version 3.7.9 2014-06-17 10:40:42 -07:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
andreykproductengine 782a7e267c MAINT-2578 FIXED Resident can add nonexistent resident to IM or add-hoc conference in "Choose resident" floater 2014-03-18 17:11:39 +02:00
Richard Linden a10eb7b240 further fix of inventory keyboard focus and tab order calculations 2013-11-05 19:30:38 -08: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
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
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
maksymsproductengine 705d85fb2f CHUI-942 FIXED Choose Resident picker problems 2013-05-30 17:04:19 +03:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Brad Payne (Vir Linden) 7731b1e542 merge 2013-05-01 15:54:02 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Nyx Linden 490edf41eb BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident picker
Added checks to validate that the selection list is non-empty
2013-04-17 19:20:42 -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
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
Merov Linden 3a49beed0e CHUI-580 : WIP : Change the display name cache system, deprecating the old protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up. 2012-12-05 20:25:46 -08:00
Gilbert Gonzales 5fbb161ba0 CHUI-305: Now searching in the resident picker works. Problem: The resident picker search results were being sent to the old global resident picker. Now resident pickers are non-global and coupled to their parent floater. 2012-09-04 13:34:33 -07:00
Gilbert Gonzales 1aadf94fe4 CHUI-305: Now the Region/Estate floater displays the frustum shadow when opening the Resident Picker. 2012-08-30 17:24:19 -07:00
Gilbert Gonzales d67c295d8b CHUI-305: Minor changes after code review. Using templated findChild() instead of getChildView(). Also using settings.xml to store common custom variables. 2012-08-30 16:20:27 -07:00
Gilbert Gonzales be61b5be2f CHUI-305: Problem: The 'resident picker' had multiple parents and due to the design of the resident picker it can have only one parent. Having multiple parents caused both parents to fight for depth ordering...which caused the flickering. Resolution: Now multiple 'resident pickers' can exist and they are coupled to the floater that spawned then. Meaning that when the parent floater closes, the 'resident picker' floater will also close. In addition, a shadow frustum eminates from the button that opened the 'resident picker'. 2012-08-29 19:18:25 -07:00
AlexanderP ProductEngine 9a49dbcc45 CHUI-299 (User can start IM session with themselves) FIXED: agent was excluded from the search results 2012-08-16 13:47:46 +03:00
Vadim ProductEngine 1b50125546 EXP-1879 FIXED Crash in People floater in mouselook mode. 2012-02-08 20:25:36 +02:00
Leyla Farazha a4b223248e Merge 2010-09-27 17:54:52 -07:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Leyla Farazha ab320a12e6 DEV-52702 Avatar search in Viewer hangs with Searching... when searching for invalid characters in Viewer 2010-08-19 15:48:51 -07:00
Richard Nelson 124bc854dd moved buildFloater out of lluictrlfactory to llfloater.cpp 2010-08-16 17:44:23 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Leyla Farazha 3057bb08be DEV-52475 Avatar picker only shows 10 results for search 2010-08-05 09:53:10 -07:00
Richard Nelson 566e3969f9 deprecated LLPanel::child*() methods 2010-07-30 10:02:30 -07:00
Leyla Farazha c897061856 Merge with q/viewer-release 2010-06-21 10:21:52 -07:00
Alexei Arabadji a3a037ea7d EXT-6710 FIXED Updated inventory items sharing behavior according to comments: "Andrey ProductEngine added a comment - 02/Jun/10 03:21 AM" and "Grumpity ProductEngine added a comment - 02/Jun/10 03:25 AM" of EXT-6710 issue.
1 Reused 'ShareNotification' with updated message.
2 Made allert message box scrollable(done by Yuri Chebotarev).
3 Updated word words_separator in strings.xml.
4 Made friends list tab of avatar picker be opened on 'share with avatar' action.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/525/

--HG--
branch : product-engine
2010-06-09 15:39:11 +03:00
Richard Linden f79ac664dd merge 2010-06-03 14:15:11 -07:00
Alexei Arabadji b41aa1e0b2 EXT-6710 FIXED Added inventory items sharing confirmation and modified alert about non-copy objects sharing.
Current behavior:
* user will be prompted about sharing items regardless is it one or more items;
* user will be prompted about trying to share one ore more non-copy items;
* in case user tries to share non-copy items among with copy items — copy  tems will be shared and user will be prompted about sharing non-copy items

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/475/

--HG--
branch : product-engine
2010-06-01 14:13:56 +03:00
Leyla Farazha 9874e4d181 fixed nearby and friends avatar picker bug 2010-05-28 13:27:30 -07:00
Leyla Farazha abcdff128c Resident Chooser fixes 2010-05-26 16:24:08 -07:00
Leyla Farazha 16e3d7ebf5 Merge 2010-05-25 14:22:56 -07:00
Leyla Farazha 7fb9410422 LLFloaterAvatarPicker now uses LLAvatarNames
reviewed by James
2010-05-25 14:15:26 -07:00
Richard Nelson 2920d4c46f merge 2010-05-24 16:37:52 -07:00
Mike Antipov 7439332656 EXT-6710 FIXED Implemented functionality to give multiselected inventory items to several selected avatars in avatar picker:
1. Select items to share
2. Click Share; Resident chooser opens
3. Select residents to share with, click SELECT
4. Selected items are transferred to selected users
5. Pop-up toast confirms transfer

Some implementation notes:
 * Avatar Picker is not closed when give inventory requests are sent (to be enable change selection and offer other items to other avatars)
 * Select button is enableв if all selected items can be offered.
 * Disabling of the "Share" menu item in the Inventory context menu is syncronized with check (before sending offer) whether item can be offered at all

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/

--HG--
branch : product-engine
2010-05-21 13:16:41 +03:00
James Cook 5aa8b5d37e Clean up merge, dueling LLDateUtil refactoring 2010-05-11 17:27:14 -07:00
James Cook 2b7153c26a merge from dessie/viewer-public right before SLE code landed 2010-05-11 16:11:09 -07:00