summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-03-13Pull merge from lindenlab/viewer-chuiMerov Linden
2013-03-13CHUI-839 : Fixed! Make the LLLineEditor in chat preferences read-only but ↵Merov Linden
selectable
2013-03-13CHUI-831 ADD FIX Minimized conversation floater is not opened with Open ↵alexanderpproductengine
Conversation Window preference if conversation receiving message is selected
2013-03-15CHUI-816 [CHUIBUG]CHUI does not remember undocked state and position of ↵AlexanderP ProductEngine
Nearby Chat
2013-03-15CHUI-830 FIXED Button for collapsing torn-off floater(to a single input ↵Mnikolenko ProductEngine
line) is added. Show toasts for new messages for that conversation, regardless of other prefs.
2013-03-14mergeGilbert Gonzales
2013-03-14CHUI-853 (Crashing on ejecting member in group): Upon receiving the ↵Gilbert Gonzales
rejection response message, the incorrect session id was being used to display the message. session_id was being used instead of new_session_id.
2013-03-15mergeCho
2013-03-14CHUI-700 FIX [CHUIBUG]"Zoom in" feature for avatars has disappearedCho
Disabled "Zoom In" menu item in the case where gObjectList.findObject() returns nothing
2013-03-13Small fix to llwindowsdl.cpp change to match sunshine-stableDon Kjer
2013-03-13Merging sunshine-stable -> sunshine-internalDon Kjer
2013-03-13Fix for gcc 4.6 build failures on Linux in llwindowsdl.cppDon Kjer
2013-03-13Fixing gcc 4.6 compiler issue on Linux in llwindowsdl.cppDon Kjer
2013-03-13Fixed unit test compile errorprep
2013-03-13mergeprep
2013-03-13Ported sunshine-internal fixes (Commits: 5271cc5 and b37c09)prep
2013-03-13fix for build failureBrad Payne (Vir Linden)
2013-03-13CHUI-816 [CHUIBUG]CHUI does not remember undocked state and position of ↵AlexanderP ProductEngine
Nearby Chat : canceled the erroneous torn-off/docked state saving when nearby chat is closes
2013-03-13build fixAlexanderP ProductEngine
2013-03-13Fixed potential memory leak in LLHTTPClient. Fixed potential hanging http ↵Don Kjer
requests in LLHTTPClient. Fixed munging of "Pragma" headers in LLHTTPClientAdapter
2013-03-13Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile ↵Don Kjer
failures
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.
2013-03-12WIP: merge fixesprep
2013-03-12SH-3944 WIP CHUI merge fixingNyx Linden
re-introduced don's refactor of low-level openGL calls pulling out of llui and putting them into llrender. Took the new code from their updated versions from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12SH-3944 WIP CHUI merge fixingNyx Linden
re-introduced don's refactor of low-level openGL calls pulling out of llui and putting them into llrender. Took the new code from their updated versions from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12Removed unneeded code.prep linden
2013-03-12CHUI-847 Fixed [CHUIBUG]Collapse Participant List, operates on all torn off ↵AlexanderP ProductEngine
chats: make flag mIsPartListExpanded for saving of the participant list panel expand/collapse state
2013-03-12CHUI-831 Minimized conversation floater is not opened with Open Conversation ↵AlexanderP ProductEngine
Window preference if conversation receiving message is selected : force unminimized of the session's floater
2013-03-12Pull merge from lindenlab/viewer-chuiMerov Linden
2013-03-12CHUI-845 : Avoid some xml param parsing error that seems to be linked with ↵Merov Linden
crashers
2013-03-12CHUI-809 FIXED Changes in menu items to make them consistent. Do not start ↵Mnikolenko ProductEngine
IM if selected person is self.
2013-03-12mergemberezhnoy
2013-03-11Pull merge from lindenlab/viewer-chuimerov
2013-03-11CHUI-793 : Fixed! Introduced ChatLoadGroupTimeout and ↵merov
ChatLoadGroupMaxMembers to mitigate slow group loading.
2013-03-11mergeGilbert Gonzales
2013-03-12CHUI-846 FIXED [crashhunters] crash in LLFontGL::maxDrawableCharsmaksymsproductengine
2013-03-11#include fixprep
2013-03-11llinventory merge fixesprep
2013-03-11CHUI-810 : Merged Marine Kelley's patch on selected text and use of return ↵merov_linden
key in chat
2013-03-11CHUI-778: Adjusted text in prompts for deleting chat log and chat ↵Gilbert Gonzales
transcripts (per UX).
2013-03-11LLWindow merge fixes for Macprep
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11more test build fixBrad Payne (Vir Linden)
2013-03-11Added gratuitous coupling to stop gcc from complainingBrad Payne (Vir Linden)
2013-03-11Viewer-chui mergeprep
2013-03-11Fix for build failure in testsBrad Payne (Vir Linden)
2013-03-11CHUI-836 FIXED [CHUIBUG]Opening chat history from the conversation log ↵maksymsproductengine
sometimes crashes the viewer
2013-03-11CHUI-815 FIXED Display whispered text in italics and shouted text as boldMnikolenko ProductEngine
2013-03-11mergeBrad Payne (Vir Linden)