summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-11-08Fix for manual merge errors.Loren Shih
2010-11-08Manual merge of llviewerwindow.cpp from mesh-development.Loren Shih
2010-11-08Backout merge of llviewerwindow; need to do manual merge since this is messy.Loren Shih
This checkin causes llviewerwindow to become the viewer-development version.
2010-11-08MergeLoren Shih
2010-11-08SH-396 WIP fix mac opensource buildNyx Linden
Missed a reference to libcollada in viewer_manifest. Hopefully should be packaged and set properly now.
2010-11-05BUILDFIX: commented out unused variable which breaks the mac build.Nyx Linden
2010-11-05Automated merge with https://hg.secondlife.com/mesh-developmentNyx Linden
2010-11-05SH-396 FIX mac build on mesh-development is brokenNyx Linden
Adding collada to the list of libraries we need to package with the viewer Not sure why this wasn't here earlier, but this should solve the packaging problem.
2010-11-05mergeBrad Payne (Vir Linden)
2010-11-05additional analysis for --analyzeperformance optionBrad Payne (Vir Linden)
2010-11-05BUILDFIX making curl asserts llinfos for non-windows platformsNyx (Neal Orman)
linux curl appears to throw an initialization error once per session after login. Can't hunt it down right now, so making curl asserts llinfos for non-windows platforms. Also added a new assert on curl initialization.
2010-11-04BUILDFIX curl error causes linux build to crash on login.Nyx (Neal Orman)
Switching curl errors from llerrs to llinfos allows the client to continue on its merry way. Will file a jira to follow up later on why the error happens in the first place.
2010-11-04merging up latest changes from viewer-developmentOz Linden
2010-11-04SH-396 WIP fix mac teamcity build for mesh-developmentNyx Linden
making sure we're copying over the necessary 3rd party library in the packaging stage
2010-11-04automated merge from http://hg.secondlife.com/viewer-betaLoren Shih
2010-11-04automated merge up from viewer-betaLoren Shih
2010-11-04merge fix for STORM-450Oz Linden
2010-11-04merge fix for STORM-261Oz Linden
2010-11-04merge fix for STORM-194Oz Linden
2010-11-04merge fix for STORM-536Oz Linden
2010-11-04Automated merge up from viewer-developmentLoren Shih
2010-11-04STORM-450 FIXED Incorrect help contexts for Sidebar People tabPaul Guslisty
- Added checking whether panel is in visible chain instead of just visibility checking
2010-11-04STORM-261 FIXED Changed line number color in script editor.Andrew Productengine
- Changed text_readonly_color in script editor to darker gray, so that line numbers are visible when scrip editor is out of focus.
2010-11-03Reverting fix for SH-391 until it works for all use casesJonathanLinden
2010-11-03STORM-194 FIXED 'Show' button in inventory offer notification to open 'My ↵Seth ProductEngine
Inventory' SP if attachments were offered. Removed the check preventing inventory SP from opening when an item of IT_ATTACHMENT type has been offered.
2010-11-03STORM-536 ADDITIONAL FIX Replaced extra calls to getChild() with using a ↵Seth ProductEngine
member pointer to LLAccordionCtrlTabHeader.
2010-11-03STORM-536 FIXED scrolling to collapsed accordion tab with keyboard arrows in ↵Seth ProductEngine
Places SP->My Landmarks. - Fixed scrolling to selected item when a folder view receives selection inside an accordion tab while being out of visible scrolling area. - Fixed scrolling to collapsed accordion tab when it receives selection while being out of visible scrolling area.
2010-11-03Fix for SH-391 'Viewer crash when enabling align planar faces on a mesh ↵JonathanLinden
object'. Paired with Runitai
2010-11-03pull fix for STORM-422Oz Linden
2010-11-03CT-633 WIP ES translation for Viewer 2.3, Set19Eli Linden
2010-11-03SH-281 Make UI in snapshot off by default.Dave Parks
2010-11-03STORM-472 Fixed crash that happened while decoding jpg image.Andrew Productengine
In case of files provided in ticket problem occured in libjpeg's jpeg_start_decompress(to be more specofic- inside it's _jinit_color_deconverter()) because if cinfo's out_color_space is RGB, then jpeg_color_space can't be JCS_YCCK (JCS_YCCK jpeg_color_space is possible for JCS_CMYK out_color_space). So when the combination of RGB and JCS_YCCK was encountered, jpeglib called ERREXIT() inside which exit() was called and viewer crashed. - Checking for this combination before calling jpeg_start_decompress() would solve this problem in this specific case, but there are a lot of possible error combinations which cause libjpeg to exit and thus crash viewer, so copypasting checks from it into viewer code would be cumbersome, uneffective and ugly. So another approach was used instead- by default libjpeg calls exit() after encountering an error, but user can provide his own error handling function instead. on_jpeg_error() function was added in fix for this. It sets true a boolean flag that is used to determine whether there were errors in getImageDimensionsJpeg(), and this function's return value depends on it.
2010-11-02STORM-283 : merge with viewer-developmentMerov Linden
2010-11-02STORM-287 : merge with viewer-developmentMerov Linden
2010-11-02STORM-420 : merge to viewer-developmentMerov Linden
2010-11-02Reverting code for fixing non-uniform scale for mesh uploads as it breaks ↵JonathanLinden
rigged meshes.
2010-11-02STORM-422 FIXED Added command line option "-disablecrashlogger" to disable ↵Vadim ProductEngine
crash logger. This is a patch originally written by Robin Cornelius. I made it work with Google Breakpad.
2010-11-01STORM-288 : merge with vewer-developmentMerov Linden
2010-11-01STORM-335 : merge with viewer-developmentMerov Linden
2010-11-01STORM-400 : merge with viewer-developmentMerov Linden
2010-11-01STORM-354 : merge with viewer-developmentMerov Linden
2010-11-01STORM-190 : merge with viewer-developmentMerov Linden
2010-11-01STORM-293 : merge with viewer-developmentMerov Linden
2010-11-01STORM-255 : merge with viewer-developmentMerov Linden
2010-11-01STORM-255 : Made changes to the tool tips for the check boxesWolfpup Lowenhar
in panel_prefferences_chat.xml
2010-11-01STORM-255 : Merge from viewer-developmentWolfpup Lowenhar
2010-11-01merge from viewer-betaMerov Linden
2010-11-01STORM-420 : Took Andrew's comment into account, fixing the issue when ↵Merov Linden
minimap was minimized
2010-11-01STORM-287 FIXED changing currnet outfit with an outfit dragged from Library ↵Seth ProductEngine
to My Inventory->Current Outfit folder.
2010-11-01STORM-283 FIXED adding attachments of type LLInventoryType::IT_ATTACHMENT to ↵Seth ProductEngine
Current Outfit.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 12:45:37 +0000