summaryrefslogtreecommitdiff
path: root/indra/newview
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-04merging up latest changes from viewer-developmentOz Linden
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-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-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-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 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-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-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-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.
2010-11-01MergeLeyla Farazha
2010-11-01changing duplicate line editor nameLeyla Farazha
2010-11-01STORM-404 : merge with viewer-developmentMerov Linden
2010-11-01SH-281 Fix for snapshots showing interface all the timeDave Parks
2010-11-01STORM-404 FIXED Fixed crash in LLPanelGroupGeneral::updateMembers().Andrew Productengine
Crash happened when trying to create new group while other group was still updating. It was caused by invalid iterator mMemberProgress in LLPanelGroupGeneral::updateMembers(). Its usage shouldn't have been reached when member list is cleared and empty thanking to gdatap->isMemberDataComplete() check at the beginning of the function. But when the new group was created while members of other group were still updating this protection failed: in LLGroupMgr::processGroupMembersReply() for the group being created mMemberDataComplete was set TRUE when group size was zero(because this new group still had no members). So the check for completness in LLPanelGroupGeneral::updateMembers() was succesfully passed, and further in this method viewer crashed. - Added check for emptiness of member list into LLPanelGroupGeneral::updateMembers().
2010-11-01STORM-288 FIXED New name resets to old if change it on 'Item Profile' panel ↵Paul Guslisty
while fetching inventory Reason: 'item info panel' updated EACH time some inventory object changed Fix: update 'item info panel' only if changed inventory object is the object for which 'item profile panel' is shown
2010-10-31STORM-255 : Merge from viewer-developmentWolfpup Lowenhar
2010-10-29STORM-420 : allow teleport when double clicking the minimap if doubleclick ↵Merov Linden
teleport is on, allow beacon setting if not
2010-10-29mergeRichard Linden
2010-10-29VWR-23444 FIXED Double clicking x on UI hint crashes Skylight ViewerRichard Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 12:34:37 +0000