summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2020-09-28Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/lltexturectrl.h
2020-05-19Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
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-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-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-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-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-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
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
2019-10-25SL-12014 Animesh is now a separate rendering typeandreykproductengine
2019-09-10Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10Merged in lindenlab/viewer-releaseandreykproductengine
2019-08-15SL-209 Cleanup Merchant Outboxandreykproductengine
2019-07-03DRTVWR-493 LLAvatarNameCache to singletoneandreykproductengine
2019-07-03SL-11535 Autopilot should store selection for later useandreykproductengine
2019-06-19DRTVWR-493 LLFollowCamMgr to singletonandreykproductengine
2019-05-23Add render debug controls for forcing disable of ambient, sun, and local ↵Graham Linden
light contributions (engages AMBIENT_KILL, SUNLIGHT_KILL, and LOCAL_LIGHT_KILL defines in shaders to accomplish those tasks as required by each render mode).
2019-05-08Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-05-08Merge viewer-releaseGraham Linden
2019-04-03SL-10189, SL-10880: Mark the day instance so that it does not try to ↵Rider Linden
reanimate a day cycle when setting a fixed sky. Add new floater for setting the shared environment to local and allowing modifications.
2019-03-25SL-10798 FIXED [Legacy Profiles] 'Picks' toolbar button does nothingmaxim_productengine
2019-03-04Added viewer based profilesKadah_Coba
Split picks and classifieds in to separate panels Moved getProfileURL to LLAvatarActions Removed dead XUI panels Removed picks/classifieds floater
2019-03-13Mods to make merge with viewer-release have less whitespace-only change and ↵Graham Linden
fix diffs between EEP and VR.
2019-02-20SL-9660: Next pass cleanup. Removed and downgraded a number of logs. ↵Rider Linden
Removed refs to LAPAS. Better sync with legacy regions.
generated by cgit v1.3 (git 2.53.0) at 2026-05-27 05:33:22 +0000