summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures
AgeCommit message (Collapse)Author
2020-05-19Merge branch 'master' into DRTVWR-483Andrey 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-24SL-307 Improvements to flashing colorAndrey Kleshchev
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-20Merged master into DRTVWR-508Andrey Kleshchev
2020-04-15SL-12607 Rearrange login panelAndrey Kleshchev
2020-04-14SL-12607 WIP, take pre-sized icons from repo instead of packageAndrey Kleshchev
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
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-12-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-12-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-27Merged in pe_devs/494-wassailAndreyL ProductEngine
2019-11-22SL-12288 Enhancement for Rotate and Track camera controlsmaxim_productengine
2019-11-13SL-11964 Removed SL Share from the viewerAndreyL ProductEngine
2019-11-08SL-12186 WIP Add new iconsmaxim_productengine
2019-09-10Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-05Upstream merge from viewer-nekoAndreyL ProductEngine
2019-08-26Merge viewer-release 6.3.1Graham Linden
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2019-08-26Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-08-15SL-209 Cleanup Merchant Outboxandreykproductengine
2019-06-27[SL-11506] - update universal iconAnchor
2019-05-22SL-10984 [EEP] Add a toolbar button to open My Environmentsmaxim_productengine
2019-04-18SL-10791 [Legacy Profiles] Functionality to copy agent id and name from profileandreykproductengine
2018-10-11MergeAnchor Linden
2018-10-04SL-1727: New icon for moon.Rider Linden
2018-09-26MergeRider Linden
2018-09-26Merge to 5.2.0Graham Linden
2018-08-24MAINT-9032 Virtual Track Ball improvementsAndreyL ProductEngine
2019-04-24SL-10994 Removed Facebook In-world SharingAndreyL ProductEngine
SL-11024 Fixed Twitter connect failure
2018-08-01MAINT-8803 Better UI handling of unrecognized inventory itemsmaxim_productengine
2018-07-18MAINT-8334 EEP UI control: Virtual TrackballAndreyL ProductEngine
2018-07-10MAINT-8833 EEP UI should be either responsive or indicate that it is disabled.andreykproductengine
2018-06-08[DRTVWR-476] - create new wearable typeAnchor Linden
2018-04-17MAINT-8374: Added inventory icons.Rider Linden
2018-03-06Settings type inventory objects and upload the assests.Rider Linden
2018-01-12STORM-2145 Merge up to viewer-releaseJonathan Yap
2018-01-11STORM-2145 A few small changesJonathan Yap
2017-02-23STORM-2145 Camera Presets -- some initial workJonathan Yap
2017-02-14MAINT-7104 Flash toolbar when grid status page is updatedMnikolenko ProductEngine
2017-02-06MAINT-7104 Add Grid status floater and toolbar buttonMnikolenko ProductEngine
2016-10-11Merged in lindenlab/viewer-bearAndreyL ProductEngine
2016-10-10Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-10-04MAINT-6748 Add Report Abuse as new Toolbar entryandreykproductengine
2016-09-16MergeRider Linden