summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2020-09-23Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2020-09-09Revert "SL-12475 add Inventory Favorites tab"Andrey Lihatskiy
This reverts commit 92499ce1b43fd60ce7aad71d12f9eef0cef04f7f. # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h
2020-08-27SL-13835 TypoAndrey Kleshchev
2020-08-27SL-13835 Fixed warning for certificateAndrey Kleshchev
2020-08-21SL-13835 SSL verification should not crash on invalid certificateAndrey Kleshchev
2020-08-18Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2020-08-06Revert "SL-11215: Add release notes URLs to update-related notifications."Andrey Kleshchev
This reverts commit bf999f2f84dd26844c60d682f563f982a55e8ee8 due to revert of updater, this will be moved to separate 'epic' instead
2020-07-21Merge branch 'master' into DRTVWR-486Andrey Kleshchev
2020-07-20Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llimprocessing.cpp
2020-07-10Reverted SL-12494Andrey Kleshchev
Change was moved to DRTVWR-514
2020-06-24SL-12688 Warnings part #2Andrey Kleshchev
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-23SL-12688 Warnings part #1Andrey Kleshchev
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
2020-06-22SL-13359 #10 Indicate face selection in tools floaterAndrey Kleshchev
2020-06-19SL-13359 #9 Texture tabAndrey Kleshchev
2020-06-19SL-13359 #8 Reverted changes to texture tabAndrey Kleshchev
This reverts commit 1e1707d532560583744bb877adfed11864f2db31.
2020-06-18SL-13359 #7 Features tabAndrey Kleshchev
2020-06-18SL-13359 #6 Fixed paddingAndrey Kleshchev
2020-06-17SL-13359 #5 Implemented revised changesAndrey Kleshchev
2020-06-15SL-13418 Restored previously removed 'click on land' controls from 'move & view'Andrey Kleshchev
According to UX UI engineer. Also adapted it to new system, but it needs a better solution.
2020-06-12SL-13421 Separated some sitting-exclusive controlsAndrey Kleshchev
2020-06-12SL-13421 Removed camera control keybindings from mouselookAndrey Kleshchev
2020-06-11SL-13438 Fixed descriptionAndrey Kleshchev
2020-06-03SL-13359 #4 Adjusted some elementsAndrey Kleshchev
2020-06-03SL-13359 #3 UI changes for panel objectAndrey Kleshchev
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py
2020-06-02DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.Nat Goodspeed
2020-06-02Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-06-02Merged master into DRTVWR-486Andrey Kleshchev
2020-06-02SL-13359 #2 UI changes for panel objectAndrey Kleshchev
todo: new icons, separator and some repositioning
2020-06-02SL-13359 #1 Revert floater_tools and object panel changesAndrey Kleshchev
2020-05-28SL-13329 Misalligned checkboxes in inventory filtersAndrey Kleshchev
2020-05-28SL-12607 Bar color to blueAndrey Kleshchev
2020-05-28SL-13340 Restored status display for loginAndrey Kleshchev
2020-05-28SL-12665 Readjusted all logosAndrey Kleshchev
2020-05-28SL-12607 Reverted to original logosAndrey Kleshchev
2020-05-27SL-13329 Misalligned checkboxes in inventory filtersAndrey Kleshchev
2020-05-19Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-05-19SL-13273 Updated the SL logo imagesAndrey Lihatskiy
2020-05-19Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2020-05-18Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # indra/llxml/llcontrolgroupreader.h # indra/newview/llviewerkeyboard.cpp
2020-05-18DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-05-18Merged master into DRTVWR-508Andrey Kleshchev
2020-05-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-04Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2020-05-04Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-05-04Merged master into DRTVWR-508Andrey Kleshchev
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 10:44:03 +0000