summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-11#include fixprep
2013-03-11llinventory merge fixesprep
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-11mergeBrad Payne (Vir Linden)
2013-03-08SH-3941 SH-3954 FIX local appearance does not update properlyNyx Linden
We were using an indicator of whether there *was* a baked texture to whether we were *using* a baked texture. Switched to one of the (several) proper indicators of whether a baked texture was in use. This should allow local texture data to get marked for download when we enter appearance mode. Local testing confirms that old apperances linger for a second or two, but are soon replaced by the correct local renders.
2013-03-08SH-3959 WIP - pass information about type of fetched image - server bake, ↵Brad Payne (Vir Linden)
host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-03-06mergeNyx Linden
2013-03-06SH-3954 SH-3941 SH-3910 FIX local appearance does not updateNyx Linden
We suppress texture downloads for local textures not needed with server side baking. We need to explicitly re-set texture priority for local textures when entering appearance mode.
2013-03-06CHUI-821 Clean up codeAlexanderP ProductEngine
2013-03-06CHUI-821 Clean up codeAlexanderP ProductEngine
2013-03-06Fix for windows build failureBrad Payne (Vir Linden)
2013-03-06mergeBrad Payne (Vir Linden)
2013-03-06make it clearer when DebugForceAppearanceRequestFailure is onBrad Payne (Vir Linden)
2013-03-05Fixing issues with not detecting when LLSD XML parsing fails. Changing most ↵Don Kjer
http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
2013-03-05For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934.Graham Madarasz (Graham)
2013-03-05Adding debug setting to allow overriding appearance service urlDon Kjer
2013-03-05Pull from viewer-beta (version number update and tag)Merov Linden
2013-03-05mergingCho
2013-03-05CHUI-809 FIXED "Start IM" menu item is addedMnikolenko ProductEngine
2013-03-05CHUI-815 FIXED Handle SHIFT+ENTER to whisper in Nearby chatMnikolenko ProductEngine
2013-03-05CHUI-772 FIX User sees no notification of conversation activity not visible ↵Cho
in long scrolling conversation list Added call to setSelectedSession() from LLConversationViewParticipant::handleMouseDown()
2013-03-04For MAINT-2423 fix regression from CHUI merge. Code review: DavePGraham Madarasz (Graham)
2013-03-04Automated mergeDon Kjer
2013-03-04Reducing amount of cof link data sent to appearance update service. ↵Don Kjer
Allowing links to items with 'null' asset ids to be passed
2013-03-04mergeGilbert Gonzales
2013-03-04Removed deprecated calls to incrementCofVersionprep
2013-03-04CHUI-778: Now when changing paths for chat logs and transcripts any empty ↵Gilbert Gonzales
conversations will be reloaded with data from the new location. Use case for this is if the users nearby chat is empty and they switch to a location that has a nearby chat file, then the nearby chat file be loaded.
2013-03-04CHUI-757 FIXED CHUI viewer shows Autopilot cancelled notification toast when ↵maksymsproductengine
interrupting click to walk: - The AutopilotCanceled notification was disabled for this viewer;
2013-03-04CHUI-822 FIXED Resizing conversation floater with conversation list ↵AlexanderP ProductEngine
minimized to icons sets to fixed width that cannot be reduced : set resize limits to conv.panel's minDim() when conv. panel is collapsed