summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
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-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-03-18Merge branch 'master' into DRTVWR-460Andrey 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
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-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-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-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.
2018-12-19Add new shaders for advanced atmo SH env lighting calcs.Graham Linden
2018-12-13SL-10236 The "Attach To", "Attach To HUD", and "Wear" options aren't greyed outandreykproductengine
2018-12-11MergeGraham Linden
2018-12-10SL-9698 [EEP] Add beacons that point to sun & moon positionmaxim_productengine
2018-12-06De-duplicate deferred gbuffer access for getPosition/getNorm.Graham Linden
De-duplicate ambient occlusion shader code and move to new aoUtil.glsl Split shared shadow tap funcs into shadowUtil.glsl
2018-11-14MergeRider Linden
2018-10-16SL-9874 [EEP] Defocus environment focus when setting environment from the menumaxim_productengine
2018-10-10SL-9849 - debug option for show impostor extentsBrad Payne (Vir Linden)
2018-10-09SL-9820 FIXED [EEP] My Environments finds the parcel's DayCycle unbidden.maxim_productengine
2018-09-27mergeBrad Payne (Vir Linden)
2018-09-26MergeRider Linden
2018-08-17MAINT-8826, MAINT-8990, MAINT-9002, MAINT-7703: Rework for environment ↵Rider Linden
pannels in Region/Estate and Parcel. Enable/disable by permission. Edit the correct environment. Dirty flags for changes. Estate owner disallow switch.
2019-05-08SL-1579 Don't put an object to 'Received Items' after taking it back into ↵maxim_productengine
inventory
2019-04-24SL-10994 Removed Facebook In-world SharingAndreyL ProductEngine
SL-11024 Fixed Twitter connect failure
2019-04-17SL-10963 FIXED The 'Copy failed' notification doesn't appear after hitting ↵maxim_productengine
'Ctrl+D' combination
2019-03-28SL-10655 Fixed 'Sit on ground' occasionally failingandreykproductengine
2018-08-03MergeRider Linden
2018-08-02mergeBrad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 04:31:35 +0000