summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2020-04-21Post-merge build fixAndrey Lihatskiy
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-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-03-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-02-07SL-10675 More leftovers cleanupAndrey Lihatskiy
=
2020-02-05Merge branch 'master' into DRTVWR-483Andrey 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-27Merged in pe_devs/494-wassailAndreyL ProductEngine
2019-11-22SL-12100 Premium Enhancements - Changes to rates to create Groups, UI Workandreykproductengine
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
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-10-23Merged 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-10Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10Merged in lindenlab/viewer-releaseandreykproductengine
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-08Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-05-08Merge viewer-releaseGraham Linden
2019-04-17Merge 6.2.1Graham Linden
2019-04-17Merged in lindenlab/viewer-releaseAndreyL ProductEngine
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-05Merged SL-10675AndreyL ProductEngine
2019-03-06Get rid of vstoolandreykproductengine
2019-03-04Fix for local studio buildsandreykproductengine
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-01Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-02-19SL-10412 Move My Avatar/Scripts to Me drop down menumaxim_productengine
2019-02-15SL-10234 Fixed The viewer shows installation language as system defaultandreykproductengine
2019-02-12Backed out changeset: 25426acca617Kadah_Coba
Added back the display name floater
2019-03-01Merged in lindenlab/viewer-release and incremented viewer version to 6.2.0AndreyL ProductEngine
2019-02-28MergeRider Linden
2019-01-25SL-1945 Day Cycle Editor Copy Trackandreykproductengine
2019-01-03SL-10293 Firestorm PR: preferences and menu searchAndreyL ProductEngine
2018-12-08SL-10153: Add ole32 to WINDOWS_LIBRARIES so it's everywhere we need.Nat Goodspeed
2018-12-07SL-10175 Update copyright year in application infoMnikolenko ProductEngine
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-27 23:06:03 +0000