summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerfloaterreg.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-02-05Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
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-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-27Merged in pe_devs/494-wassailAndreyL ProductEngine
2019-11-13SL-11964 Removed SL Share from the viewerAndreyL ProductEngine
2019-11-08SL-12186 WIP Add new 'My camera presets' floatermaxim_productengine
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-08-09SL-9699 Login selectionandreykproductengine
2019-05-08Fix merge fail.Graham Linden
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-12Backout tabs v spaces changes.Graham Linden
'warn-on-failure:no-tabs'
2019-03-11Tabs -> spaces.Graham Linden
2019-02-19SL-10412 Move My Avatar/Scripts to Me drop down menumaxim_productengine
2018-10-01SL-9660 EEP Remove residual code (LLFloaterEditDayCycle and ↵maxim_productengine
LLEnvironment::UserPrefs)
2018-09-14SL-1956 added support for temporary bans to parcel ban listAndreyL ProductEngine
2019-04-24SL-10994 Removed Facebook In-world SharingAndreyL ProductEngine
SL-11024 Fixed Twitter connect failure
2018-08-03MergeRider Linden
2018-08-02Merge viewer-releaseGraham Linden
2018-07-03MAINT-8821: New "My Environments" floater. First pass.Rider Linden
2018-06-22SL-857 revertedmaxim_productengine
2018-06-21Merge 5.1.7Graham Linden
2018-06-21MergeRider Linden
2018-06-11remove legacy environmental edit floater and some lingering transition ↵Rider Linden
functions. Change floater environment switch behavior.
2018-06-06Various editor fixes. Start adding a settings picker.Rider Linden
2018-05-21SL-857 Remove "Create Auction" functionality from viewermaxim_productengine
2018-05-11Remove the old sky and water edit dialogs.Rider Linden
2018-05-02Fixed sky editing floater.Rider Linden
2018-04-27Adding fixed water edit dialog.Rider Linden
2018-01-23MAINT-8052: One more step towards parcel environments.Rider Linden
2018-01-23Adding a couple files that got skipped.Rider Linden
2018-01-15STORM-2145 Fixed bug. Now you can only have one of the load/save/delete ↵Jonathan Yap
floaters open at once.
2018-01-13STORM-2145 Added a small floaterJonathan Yap
2017-11-10Remove delete preset dialog, Initial settings for selection level ↵Rider Linden
(Region/Parcel/Local)
2017-04-27MAINT-6519 Contribution, adds feature to replace inventory linksAnsariel
2017-04-28MAINT-7354 Trash alert should display trash, not prompt to purge it allandreykproductengine
2017-03-15MAINT-7168 Avatar rendering settings adjustmentsMnikolenko Productengine
2017-02-06MAINT-7104 Add Grid status floater and toolbar buttonMnikolenko ProductEngine
2016-11-21Merged in Ansariel/storm-2141AndreyL ProductEngine
2016-11-14STORM-2141: Fix various inventory floater related issues:Ansariel
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path * Closing new inventory windows don't release memory * During shutdown legacy and inoperable code for inventory window cleanup is called * Remove old and unused inventory legacy code
2016-09-27MAINT-6737 [VOB] Show confirmation floater when dnd an image to an Outfit folderMnikolenko Productengine
2016-05-24Merge VOB with release 4.0.6pavelkproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 08:10:31 +0000