summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
AgeCommit message (Collapse)Author
2021-07-21SL-15297 toolbar button is added & changing quality via radio group is ↵Mnikolenko Productengine
handled correctly now
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-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-07-19SL-15592 Emergency login failure dialogAndrey Kleshchev
Server message by id "LoginFailure" was pulling in header instead of a message
2021-07-19SL-15297 performance floater UI update #2Mnikolenko Productengine
2021-07-16SL-15574 If login response provides ISO8601 time, convert to localAndrey Kleshchev
2021-07-15SL-443 Keybindings: Backward compatibility #2Andrey Kleshchev
2021-07-15SL-443 Keybindings: Support reassigment of script interaction buttonAndrey Kleshchev
2021-07-15SL-15574 Fixed message mising some textAndrey Kleshchev
2021-07-15SL-443 Keybindings: Support reassigment of script interaction buttonAndrey Kleshchev
2021-07-15Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2021-07-14SL-15297 performance floater ui updateMnikolenko Productengine
2021-07-12DRTVWR-542 WIP #6Andrey Kleshchev
Trying out 'sloppy' variant
2021-07-12SL-14795 Remove landmark notification in nearby chatMnikolenko Productengine
2021-07-09SL-14799 add "Hide beacon" buttonMnikolenko Productengine
2021-07-07DRTVWR-542 WIPAndrey Kleshchev
2021-07-01SL-15512 Update text in the Favorites Bar and Favorites windowMnikolenko Productengine
2021-06-30SL-15428 The voice chat setting is so close to previous element that label ↵Andrey Kleshchev
gets overlooked
2021-06-29SL-15297 WIP update Individual settings panel & correctly show avatar state ↵Mnikolenko Productengine
in the list
2021-06-29SL-15487 Rename volume sliderMnikolenko Productengine
2021-06-25SL-15297 WIP restore selection after updating the list & don't show avatars ↵Mnikolenko Productengine
in the list as disabled when complexity is not limited
2021-06-25Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2021-06-25Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorypanel.cpp
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-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-06-24SL-15297 WIP Implement performance floater - implement complexity barsMnikolenko Productengine
2021-06-18SL-15297 WIP Implement performance floater - Quick and Individual settings ↵Mnikolenko Productengine
panels
2021-06-17SL-15297 WIP Implement performance floater - updated UIMnikolenko Productengine
2021-06-16SL-15406 Removed text below initial login screen screenshotsAndrey Kleshchev
2021-06-15SL-15297 WIP Implement performance floater #2Mnikolenko Productengine
2021-06-11SL-15297 WIP Implement performance floaterMnikolenko Productengine
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
2021-06-07Merge branch 'master' into DRTVWR-531Callum Prentice
2021-06-07Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-06-07Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy