summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
AgeCommit message (Collapse)Author
2021-08-10Merge remote-tracking branch 'origin/master' into DRTVWR-521-maintAndrey Lihatskiy
2021-07-23Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelpicks.h # indra/newview/llviewerfloaterreg.cpp
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-19Merge with tip of Master after a Viewer releaseCallum Prentice
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-15SL-443 Keybindings: Backward compatibility #2Andrey Kleshchev
2021-07-15SL-443 Keybindings: Support reassigment of script interaction buttonAndrey Kleshchev
2021-07-12SL-14795 Remove landmark notification in nearby chatMnikolenko Productengine
2021-07-09SL-14799 add "Hide beacon" buttonMnikolenko Productengine
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-15487 Rename volume sliderMnikolenko 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-16SL-15406 Removed text below initial login screen screenshotsAndrey Kleshchev
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-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
2021-06-07Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-06-05SL-15346 "Listing ID" field has OS-dependent length restrictionAndrey Kleshchev
2021-06-03SL-15340 The list of parcels is duplicated after reopeningAndrey Kleshchev
1. Clean list before requesting 2. Don't trigger onOpen from menu if already open
2021-05-31SL-15331 Don't truncate server version in the “Region Estate” floaterMnikolenko Productengine
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-15199 Remember search results state after minimizing when pressing CTRL+FMnikolenko Productengine
2021-05-11SL-15168 Reset title of guidebook when openingAndrey Kleshchev
2021-05-06Merge branch master (DRTVWR-515) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
2021-04-30SL-14769 Add dialog to warn user if inventory is unusable, force logoutMnikolenko Productengine
2021-04-30Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-04-29Clean up a merge conflictCallum Prentice
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 00:43:15 +0000