summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2021-11-16Merge branch master (DRTVWR-545) into DRTVWR-542-meshoptAndrey Kleshchev
2021-11-10SL-15521 Fix debian license file not mentioning meshoptimizerAndrey Kleshchev
Just in case
2021-11-10SL-14403 Removed glodAndrey Kleshchev
2021-09-09SL-15965 Support wider range of parsing errorsAndrey Kleshchev
2021-09-06Revert "SL-443 Keybindings: Support reassigment of script interaction button"Andrey Kleshchev
This reverts commit a5675bedbb2bd34ce03dd16651dc74d8078efea9. Commit slipped in by accident
2021-08-10Merge master (DRTVWR-531) into DRTVWR-542-meshoptAndrey Kleshchev
2021-08-10Merge remote-tracking branch 'origin/master' into DRTVWR-521-maintAndrey Lihatskiy
2021-08-04DRTVWR-542 Automated method selectionAndrey Kleshchev
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
2021-07-28DRTVWR-542 Rename simplification methods in UI and add a fallbackAndrey Kleshchev
2021-07-23DRTVWR-542 Attempt to simplify all faces of an object as a whole and split ↵Andrey Kleshchev
back into faces
2021-07-19Merge with Master after Viewer Release (also fixed some glaring automerge ↵Callum Prentice
screw ups)
2021-07-20Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp
2021-07-20Merge master (DRTVWR-516) into DRTVWR-542-meshoptAndrey Kleshchev
2021-07-15SL-443 Keybindings: Support reassigment of script interaction buttonAndrey Kleshchev
2021-07-12DRTVWR-542 WIP #6Andrey Kleshchev
Trying out 'sloppy' variant
2021-07-07DRTVWR-542 WIPAndrey Kleshchev
2021-07-01SL-15512 Update text in the Favorites Bar and Favorites windowMnikolenko Productengine
2021-06-25Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp
2021-06-24Merge branch 'master' into DRTVWR-531Callum Prentice
2021-06-16SL-15406 Removed text below initial login screen screenshotsAndrey Kleshchev
2021-06-07Merge branch 'master' into DRTVWR-531Callum Prentice
2021-06-07Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-06-07Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-06-04SL-15350 Update images for New User viewer log in pageAndrey Lihatskiy
2021-05-25SL-15285 Restore 'drop item' functionality in right click menuAndrey Kleshchev
2021-05-25Fix duplicate name is XML (FS:Ansarial)Callum Prentice
2021-05-25SL-15298 Move Landmark's Edit buttonAndrey Kleshchev
2021-05-19Fix for SL-12320 The Viewer functionality is broken with an in-viewer ↵Callum Prentice
enabled proxy - there isn't an obvious way to set proxy information for CEF alone and QA asserts that the system setting is used so we are removing the proxy UI from the preferences floater. I purposely left everything else in place (config floater, media plugin messages etc.) so we can consider adding CEF specific support one day.
2021-05-14Fixes SL-14897 Disable Flash support in the embedded browserCallum Prentice
2021-05-12Revert "SL-15168 Changed format"Andrey Kleshchev
2021-05-11SL-15168 Reset title of guidebook when openingAndrey Kleshchev
2021-04-30Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-04-29Merge master (DRTVWR-515) into DRTVWR-516-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/llcoros.cpp # indra/llmessage/llcoproceduremanager.cpp # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/llfloaterimsessiontab.cpp
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-29Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/skins/default/xui/en/strings.xml
2021-04-28SL-15174 set Starting Guidebook location on-screenMnikolenko Productengine
2021-04-23SL-14842 Tooltip for clear historyAndrey Kleshchev
2021-04-22SL-14842 Clear history should be it's own buttonAndrey Kleshchev
2021-04-21Revert "SL-12475 add Inventory Favorites tab"Mnikolenko Productengine
2021-04-21SL-14842 Clear history button was in wrong menuAndrey Kleshchev
2021-04-20SL-14906 Fix LLFloaterHowTo overriding stored positionAndrey Kleshchev
preferred_media_size was repositioning the floater
2021-04-20SL-15028 Update menu items on the login screenMnikolenko Productengine
2021-04-17SL-14906 More adjustments to guidebookAndrey Kleshchev
The Guidebook should remember it's open/closed state between sessions. The Guidebook button should show as pressed while the Guidebook is open.
2021-04-16SL-13395 Allow creating outfit folders under My OutfitsAndrey Kleshchev
2021-04-15SL-15118 Search link in People floater should open Search but not submit a ↵Mnikolenko Productengine
search.
2021-04-14SL-14800 Clarify message when maturity level exceededMnikolenko Productengine
2021-04-06SL-14960 Add checkbox to turn off collision sound.Mnikolenko Productengine
2021-04-01Merge branch 'master' into DV525-merge-6.4.18Dave Houlton