summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2021-06-09SL-15363 how_to on older viewers is forced to persistAndrey Kleshchev
Older how_to floater is not set to persist in between sessions and gets stuck, ranamed new how_to into guidebook to avoid the issue
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-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-15028 Move guidebook code into own flaoterAndrey Kleshchev
To help with dispatcher and unify code
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-515-maintAndrey Lihatskiy
2021-03-29SL-15034 Revisions to dedicated Avatar menusAndrey Kleshchev
2021-03-25SL-15028 Guidebook floaterMnikolenko Productengine
2021-03-23SL-14900 new Landmark creation flowMnikolenko Productengine
2021-02-25SL-14654 [EEP] Aplying settings locally now is instantAndrey Kleshchev
The 1 second fade makes it harder to compare different settings.
2021-02-19SL-14654 [EEP] Aplying settings locally now takes 1 second insterad of 5Andrey Kleshchev
2021-02-17Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-17Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-02-17Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-02-01Merge branch 'master' into DRTVWR-514-keymappingsAndrey Kleshchev
# Conflicts: # indra/llui/llscrolllistctrl.cpp
2021-02-01Merge 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-01Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2021-02-01Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-11-26Revert "SL-13463 Add 'Reset scripts' button to Content tab of Build floater"Mnikolenko Productengine
2020-11-24Revert "SL-13479 Dedicated top-level menu for avatar editing"Andrey Lihatskiy
This reverts commit ca6bb3506d13975bd5a817a09658fa78d7716cc6.
2020-11-24Revert "SL-13479 Avatar menu tweaks"Andrey Lihatskiy
This reverts commit 05ce7511aa6ffebe78676d714a621a1fe04c66e2.
2020-11-24SL-13479 Avatar menu tweaksMnikolenko Productengine
2020-11-24SL-13479 Dedicated top-level menu for avatar editingMnikolenko 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-13Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-11-11Merged master (DRTVWR-507) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey 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-06SL-14203 add menu items to open Linden Homes and Premium Membership web pagesMnikolenko Productengine
2020-11-03SL-14190 moved sAvatarDictionaryAndrey Kleshchev
2020-10-22SL-14142 - cleanup and fixes for non-functioning impostors, status tracking ↵Brad Payne (Vir Linden)
in debug view
2020-09-28Merge branch 'master' into DRTVWR-518-uiAndrey 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-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-09-28Merged master (DRTVWR-497) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-23SL-13814 Updated label textMnikolenko Productengine
2020-08-19SL-13803 FIXED Objects do not link with the"Ctrl+L" shortcut keysMnikolenko Productengine
2020-07-21SL-13628 FIXED Object's name and description are not populated when cycling ↵Mnikolenko Productengine
through faces
2020-07-08SL-13479 Avatar menu tweaksMnikolenko Productengine
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
2020-06-23SL-6109 LMB DLMB in progressandreykproductengine
2020-06-19SL-13479 Dedicated top-level menu for avatar editingMnikolenko Productengine
2020-06-16SL-13463 Add 'Reset scripts' button to Content tab of Build floaterMnikolenko Productengine
2020-06-10SL-13413 FIXED Camera behaviour changed on ESC in Camera Presets viewerMnikolenko Productengine
2020-05-28SL-13239 Add 'Touch' to the various attachment context menusMnikolenko Productengine
2020-05-28SL-13337 Remove teen account limitations concerning undergarmentsMnikolenko Productengine
2020-05-22SL-13190 Allow Edit Attached Object Position From InventoryMnikolenko Productengine
2020-05-18Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # indra/llxml/llcontrolgroupreader.h # indra/newview/llviewerkeyboard.cpp
2020-05-18Merged master into DRTVWR-497Andrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 13:23:06 +0000