summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2020-11-11Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp
2020-11-02SL-14075 Allow bulk download of textures/picturesMnikolenko Productengine
2020-10-14Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatermodelpreview.cpp
2020-09-29SL-13500 loadShaderFile crashAndrey Kleshchev
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-25SL-12962 rename remained stringsMnikolenko Productengine
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
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' 6.4.8 into DRTVWR-497Dave Houlton
2020-08-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-08-12SL-13583 Some behavior tweaks #1Andrey Kleshchev
2020-08-11Merged master into DRTVWR-482Andrey Kleshchev
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-08-03SL-13698 FIXED crash on model uploadMnikolenko Productengine
2020-07-27SL-13650 Ice level Slider GraduationAndrey Kleshchev
2020-07-27SL-13483 Rename Avatar tab to "Rigging"Andrey Kleshchev
2020-07-23Merge branch 'master' v6.4.6 into DRTVWR-497Dave Houlton
2020-07-21Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
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-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
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-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py
2020-06-02Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llaudioengine_fmodex.cpp
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-482Andrey Kleshchev
2020-06-02Merged master into DRTVWR-497Andrey Kleshchev
2020-05-28SL-13329 Misalligned checkboxes in inventory filtersAndrey Kleshchev
2020-05-28SL-12607 Bar color to blueAndrey Kleshchev
2020-05-28SL-13239 Add 'Touch' to the various attachment context menusMnikolenko Productengine
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-26SL-13279 Changes in Landmarks view UI - clarify that Notes are editableMnikolenko Productengine
2020-05-22SL-13190 Allow Edit Attached Object Position From InventoryMnikolenko Productengine
2020-05-19Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-05-19SL-13273 Updated the SL logo imagesAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 21:14:05 +0000