summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2020-06-02Merged master into DRTVWR-482Andrey Kleshchev
2020-05-19Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-05-18Merged master into DRTVWR-508Andrey 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-22SL-13078 Split LLModelPreview and LLFloaterModelPreview into separate filesAndrey Kleshchev
2020-04-20Merged master into DRTVWR-508Andrey Kleshchev
2020-04-13SL-12607 Added more icons and draw methods to draw themAndrey Kleshchev
2020-04-09SL-12999 Some menus allow mouse scroll to zoom cameraAndrey Kleshchev
2020-04-08SL-12607 FMOD Logo, small improvementAndrey Kleshchev
2020-03-19Merged master into sl-11445_fmodstudioAndrey Kleshchev
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-02-04SL-12654 Remove support for building with fmod exAndrey Kleshchev
2020-01-31Merged in SL-11445 Upgrade Fmodex to Fmod StudioAndrey Kleshchev
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-08SL-12510 Revert changes and separate 'Save Graphic Preset' floaterMnikolenko 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-27Merged in pe_devs/494-wassailAndreyL ProductEngine
2019-11-22SL-12100 Premium Enhancements - Changes to rates to create Groups, UI Workandreykproductengine
2019-11-14Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-13SL-11964 Removed SL Share from the viewerAndreyL ProductEngine
2019-11-12SL-10498 - benefits info received at login, persisted in new LLAgentBenefits ↵Brad Payne (Vir Linden)
singleton.
2019-11-08SL-12186 WIP Add new 'My camera presets' floatermaxim_productengine
2019-10-31Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-10-16mergeBrad Payne (Vir Linden)
2019-10-15Merge from viewer-releaseandreykproductengine
2019-10-09Downstream merge from lindenlab/viewer-manulAndreyL ProductEngine
2019-10-09Merged in lindenlab/viewer-xcode11AndreyL ProductEngine
2019-09-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-vs2017Nat Goodspeed
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10Merged in lindenlab/viewer-releaseandreykproductengine
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-05SL-11315 Viewer asks to play media and retains selected choiceandreykproductengine
2019-08-09SL-9699 Login selectionandreykproductengine
2019-06-26DRTVWR-476: Pass Obj-C++ switch needed for BugsplatMac on Xcode 10.2.Nat Goodspeed
2019-06-20SL-11432 FIXED [OSX] Avatar is spinning when pressing Alt+D+Command and then ↵Mnikolenko ProductEngine
releasing D key
2019-05-08Merge 6.2.2Graham Linden
2019-05-08Merge viewer-releaseGraham Linden
2019-04-17Merge 6.2.1Graham Linden
2019-04-17Merge 6.2.1Graham Linden
2019-04-17Merged in lindenlab/viewer-release (EAM)AndreyL ProductEngine
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-06Get rid of vstoolandreykproductengine
2019-03-04Fix for local studio buildsandreykproductengine
2019-02-28MergeGraham Linden