summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2021-02-17Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-01Merge branch 'master' into DRTVWR-514-keymappingsAndrey Kleshchev
# Conflicts: # indra/llui/llscrolllistctrl.cpp
2021-02-01Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
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-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-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-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-08-19SL-13803 FIXED Objects do not link with the"Ctrl+L" shortcut keysMnikolenko Productengine
2020-07-08SL-13479 Avatar menu tweaksMnikolenko Productengine
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-18Merged master into DRTVWR-497Andrey Kleshchev
2020-04-26Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
# Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-03-18Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-03-18Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-02-06Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-02-05Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2020-01-28Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into ↵Brad Payne (Vir Linden)
DRTVWR-481 Merge
2020-01-06Merged in viewer-releaseAndreyL ProductEngine
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-12-16mergeBrad Payne (Vir Linden)
2019-12-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-20SL-10499 - handle package info from benefits serviceBrad Payne (Vir Linden)
2019-11-19SL-10499 - Fixes for benefits info and upload, especially bulk uploadBrad Payne (Vir Linden)
2019-11-18possible fix for mac compilation errorBrad Payne (Vir Linden)
2019-11-15SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. ↵Brad Payne (Vir Linden)
Group-related costs and limits via benefits.
2019-11-14Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-14SL-10499, SL-10497 - use LLAgentBenefits infoBrad Payne (Vir Linden)
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-13SL-12186 WIP Get rid of excessive offset settings as we moved to store data ↵maxim_productengine
in xml
2019-11-12Downstream merge from 494-maint-wassailAndreyL ProductEngine
2019-11-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-08SL-12186 WIP Minor updates for 'Camera controls' and 'Save preset' floatersmaxim_productengine
2019-10-29SL-12196 Crash at updateMeshTexturesandreykproductengine
2019-11-14Merged in lindenlab/viewer-releaseAndreyL ProductEngine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:09:41 +0000