summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-28Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/lltexturectrl.h
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-23Revert "SL-13814 Updated label text"Mnikolenko Productengine
This reverts commit 1557cd8fe2733c32c7788daf752fe23c7190947f.
2020-09-23SL-13814 Updated label textMnikolenko Productengine
2020-09-04SL-13814 Updated label textMnikolenko Productengine
2020-09-02SL-8225 Do not sit or autopilot to 'zero' global coordinatesAndrey Kleshchev
Also significantly increases autopilot flight precision
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-19Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
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
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
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-21Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llviewerfloaterreg.cpp # indra/newview/skins/default/xui/de/floater_preview_texture.xml # indra/newview/skins/default/xui/es/floater_preview_texture.xml # indra/newview/skins/default/xui/fr/floater_preview_texture.xml # indra/newview/skins/default/xui/it/floater_preview_texture.xml # indra/newview/skins/default/xui/ja/panel_edit_classified.xml # indra/newview/skins/default/xui/ja/panel_me.xml # indra/newview/skins/default/xui/ru/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/floater_picks.xml # indra/newview/skins/default/xui/tr/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/panel_edit_classified.xml # indra/newview/skins/default/xui/tr/panel_me.xml # indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-03-28Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-03-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
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-483Andrey Lihatskiy
2020-02-05Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-02-03Merge branch 'DRTVWR-500' into DRTVWR-501Andrey 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-12-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-27Upstream merge from viewer-nekoAndreyL 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
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 05:30:45 +0000