Age | Commit message (Collapse) | Author | |
---|---|---|---|
2021-04-16 | SL-15028 Move guidebook code into own flaoter | Andrey Kleshchev | |
To help with dispatcher and unify code | |||
2021-04-01 | Merge branch 'master' (DRTVWR-514) into DRTVWR-518-ui | Andrey Kleshchev | |
# Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034 | |||
2021-04-01 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2021-04-01 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/lltoolpie.cpp | |||
2021-04-01 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-04-01 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
2021-04-01 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-29 | SL-15034 Revisions to dedicated Avatar menus | Andrey Kleshchev | |
2021-03-25 | SL-15028 Guidebook floater | Mnikolenko Productengine | |
2021-03-23 | SL-14900 new Landmark creation flow | Mnikolenko Productengine | |
2021-03-12 | SL-14961 Bugsplat logging | Andrey Kleshchev | |
2021-02-25 | SL-14654 [EEP] Aplying settings locally now is instant | Andrey Kleshchev | |
The 1 second fade makes it harder to compare different settings. | |||
2021-02-19 | SL-14654 [EEP] Aplying settings locally now takes 1 second insterad of 5 | Andrey Kleshchev | |
2021-02-17 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2021-02-17 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2021-02-17 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-02-17 | Merge branch 'master' into DRTVWR-514-keymappings | Andrey Lihatskiy | |
2021-02-17 | Merge branch 'master' into DRTVWR-518-ui | Andrey Lihatskiy | |
2021-02-17 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
2021-02-17 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-02-01 | Merge branch 'master' into DRTVWR-514-keymappings | Andrey Kleshchev | |
# Conflicts: # indra/llui/llscrolllistctrl.cpp | |||
2021-02-01 | Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵ | Andrey Kleshchev | |
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069) | |||
2021-02-01 | Merge remote-tracking branch 'origin/master' into DRTVWR-517 | Brad Payne (Vir Linden) | |
2021-02-01 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2021-02-01 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2021-02-01 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llappviewer.cpp | |||
2021-02-01 | Merge branch 'master' into DRTVWR-518-ui | Andrey Lihatskiy | |
2021-02-01 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
2020-11-26 | Revert "SL-13463 Add 'Reset scripts' button to Content tab of Build floater" | Mnikolenko Productengine | |
2020-11-24 | SL-14366 Close empty script actions floater | Mnikolenko Productengine | |
2020-11-24 | Revert "SL-13479 Dedicated top-level menu for avatar editing" | Andrey Lihatskiy | |
This reverts commit ca6bb3506d13975bd5a817a09658fa78d7716cc6. | |||
2020-11-24 | Revert "SL-13479 Avatar menu tweaks" | Andrey Lihatskiy | |
This reverts commit 05ce7511aa6ffebe78676d714a621a1fe04c66e2. | |||
2020-11-24 | SL-13479 Avatar menu tweaks | Mnikolenko Productengine | |
2020-11-24 | SL-13479 Dedicated top-level menu for avatar editing | Mnikolenko Productengine | |
2020-11-13 | Merge branch 'master' into DRTVWR-518-ui | Andrey Lihatskiy | |
2020-11-13 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
# Conflicts: # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.cpp # indra/newview/llenvironment.cpp | |||
2020-11-13 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llfloaterfixedenvironment.cpp | |||
2020-11-13 | Merge remote-tracking branch 'origin/master' into DRTVWR-517 | Brad Payne (Vir Linden) | |
2020-11-11 | Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp | |||
2020-11-11 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/newview/llpanelavatar.cpp | |||
2020-11-11 | Merged master (DRTVWR-507) into DRTVWR-514-keymappings | Andrey Kleshchev | |
2020-11-11 | Merge branch 'master' into DRTVWR-513-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/llui/llfolderviewmodel.h # indra/newview/lltexturecache.cpp # indra/newview/llviewermenu.h # indra/newview/skins/default/xui/en/menu_wearable_list_item.xml | |||
2020-11-10 | SL-14303 Fix LLWearableType to not spam in logs | Andrey Kleshchev | |
2020-11-06 | SL-14203 add menu items to open Linden Homes and Premium Membership web pages | Mnikolenko Productengine | |
2020-11-03 | SL-14190 moved sAvatarDictionary | Andrey Kleshchev | |
2020-10-22 | SL-14142 - cleanup and fixes for non-functioning impostors, status tracking ↵ | Brad Payne (Vir Linden) | |
in debug view | |||
2020-09-28 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llvocache.cpp | |||
2020-09-28 | Merge branch 'master' into DRTVWR-518-ui | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llfloaterbuycurrency.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.h # indra/newview/skins/default/xui/en/floater_buy_currency.xml | |||
2020-09-28 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp | |||
2020-09-28 | Merge branch 'master' into DRTVWR-513-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llgroupmgr.cpp |