summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
AgeCommit message (Collapse)Author
2021-07-19Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorypanel.cpp
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp
2021-06-07Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-06SL-15168 Viewer side functionality for guidebook window openingAndrey Kleshchev
2021-04-30SL-14769 Add dialog to warn user if inventory is unusable, force logoutMnikolenko Productengine
2021-04-30Merge branch 'master' into DRTVWR-527-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-22Merge branch 'SL-14862' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llstartup.cpp
2021-04-16SL-15028 Move guidebook code into own flaoterAndrey Kleshchev
To help with dispatcher and unify code
2021-04-15SL-14906 Open Guidebook floater on first loginAndrey Kleshchev
2021-04-13SL-15013 Block List very often is empty when I log inAndrey Kleshchev
It looks like these messages were often getting lost. These requests have higher, more visible impact if lost, so doubled retries. As per Ansariel's suggestion moved request to a less busy stage.
2021-04-01Merge branch 'master' into DV525-merge-6.4.18Dave Houlton
2021-04-01Merge branch 'master' (DRTVWR-514) into DRTVWR-518-uiAndrey Kleshchev
# Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
2021-04-01Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-16SL-14936 Do not create a saved outfit automatically for new usersAndrey Kleshchev
2021-03-11Merge branch 'SL-14862' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llviewerstats.cpp
2021-03-10SL-14862 - tab loggingBrad Payne (Vir Linden)
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
2021-03-09Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' v 6.4.15 into DRTVWR-525Dave Houlton
2021-03-02Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-10SL-14807 Viewer crashes when creating an experienceAndrey Kleshchev
2020-12-17SL-14570 - error reporting and preventionBrad Payne (Vir Linden)
2020-12-17SL-14570 - detailed breakdown of system folder issues in inventory ↵Brad Payne (Vir Linden)
validation. More info about expected state of system folders in llfoldertype
2020-11-17SL-14342 FIXED Crash: "Uninitialized param singleton LLVoiceClient"Mnikolenko Productengine
2020-11-13Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-11-13Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llfloaterfixedenvironment.cpp
2020-11-11Merge branch 'master' 6.4.12 into DRTVWR-510Dave Houlton
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-06SL-14203 add menu items to open Linden Homes and Premium Membership web pagesMnikolenko Productengine
2020-10-15SL-13424 Add Rad Games Tools local Telemetry profiler supportPtolemy
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-30 23:13:21 +0000