summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2020-11-13Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.cpp # indra/newview/llenvironment.cpp
2020-10-14Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
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-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvocache.cpp
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-23Revert " SL-13823 FIXED "Settings" are not shown in Inventory filter message"Mnikolenko Productengine
This reverts commit 0048a4cf18f958591c5e4f9ec829e4ecdc642926.
2020-09-23Revert "SL-13824 Remove notification when joining a group"Mnikolenko Productengine
This reverts commit fc74a2df6364889149b5ebd0638839582fda358f.
2020-09-23Revert "SL-13824 Remove notification when both joining a group and leaving a ↵Mnikolenko Productengine
group" This reverts commit 34786ac22129aac372eeb1e73b6baac6bfad644e.
2020-09-23Revert "SL-13852 Add visibility options to inventory search results"Mnikolenko Productengine
This reverts commit 18566c502398e0e449717a06b1ffae3966e55522.
2020-09-23Revert "SL-11867 Show “Unable to buy” message via notification"Mnikolenko Productengine
This reverts commit 7e2e2503c5fb57736844bdad0f309d2d49ee86b2.
2020-09-23Revert "SL-13814 Clarify dialog for insufficient L$ balance"Mnikolenko Productengine
This reverts commit f150600ffb17232bfa88a6225aab437460fc9520.
2020-09-23Revert "SL-13814 Updated label text"Mnikolenko Productengine
This reverts commit 1557cd8fe2733c32c7788daf752fe23c7190947f.
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-22SL-13971 [Cleanup] Viewer complains about missing VertexShaderEnableAndrey Kleshchev
2020-09-14SL-13937 FIXED 'Loading...' is constantly displayed when entering the URL on ↵Mnikolenko Productengine
the 'Media URL' floater
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-09-04SL-13814 Updated label textMnikolenko Productengine
2020-09-03SL-13814 Clarify dialog for insufficient L$ balanceMnikolenko Productengine
2020-09-02SL-8225 Do not sit or autopilot to 'zero' global coordinatesAndrey Kleshchev
Also significantly increases autopilot flight precision
2020-09-01SL-11867 Show “Unable to buy” message via notificationmaxim_productengine
2020-08-31SL-13852 Add visibility options to inventory search resultsMnikolenko Productengine
2020-08-27SL-12585 Decrease space for time fieldAndrey Kleshchev
2020-08-27SL-13835 TypoAndrey Kleshchev
2020-08-27SL-13835 Fixed warning for certificateAndrey Kleshchev
2020-08-26SL-13824 Remove notification when both joining a group and leaving a groupMnikolenko Productengine
2020-08-21SL-13835 SSL verification should not crash on invalid certificateAndrey Kleshchev
2020-08-21SL-13824 Remove notification when joining a groupMnikolenko Productengine
2020-08-21 SL-13823 FIXED "Settings" are not shown in Inventory filter messageMnikolenko Productengine
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