summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
AgeCommit message (Collapse)Author
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-16SL-18161 Change pbr folder nameAndrey Kleshchev
2022-09-15SL-18161 Fix missing folder name localizationsAndrey Kleshchev
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
2022-08-08SL-17695 Give materials and textures imported by Material Editor a sensible ↵Callum Linden
name - first pass - likely need to be refined but may be good enough for now
2022-07-11SL-17640 Fixed missing asset stringAndrey Kleshchev
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-559Andrey Kleshchev
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-06-24SL-17650 Add Material as a filter option to Inventory filter floaterMnikolenko Productengine
2022-06-14SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.Dave Parks
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-05-11SL-15312 Profiles tweaksAndrey Kleshchev
Fix loading indicators to be at the center of picls and classified Hide classifieds and picks related buttons for other agents 10px distance from image Fix chat history menu button not working Changed 'partner' field behavior Prevent selection of disabled FL text field
2022-05-11SL-17356 Viewer changes for Premium Plus supportAndrey Lihatskiy
2022-05-06SL-17356 Viewer changes for Premium Plus supportAndrey Lihatskiy
2022-05-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/viewer_components/login/lllogin.cpp
2022-05-04Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2022-05-04Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-04-07SL-17171 Display Marketplace Error Messages only when trying to use MarketplaceAndrey Kleshchev
2022-03-07Match error message updated on server side for SL-16869Brad Kittenbrink
2022-02-18SL-16869 Removed unused LoginFailedAuthenticationFailedMFA message id.Brad Kittenbrink
2022-01-14SL-16654 simplify MFA token prompt UI to use notifications instead of new ↵Brad Kittenbrink
custom floater.
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-12-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-11-05SL-16320 Remove references to AvaLine from the viewerAndrey Kleshchev
2021-08-20DRTVWR-534: collection of minor UI tweaks and fixes via XUI changesCallum Prentice
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-07-23Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelpicks.h # indra/newview/llviewerfloaterreg.cpp
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-07-19SL-15592 Emergency login failure dialogAndrey Kleshchev
Server message by id "LoginFailure" was pulling in header instead of a message
2021-07-16SL-15574 If login response provides ISO8601 time, convert to localAndrey Kleshchev
2021-07-15SL-15574 Fixed message mising some textAndrey Kleshchev
2021-07-01SL-15512 Update text in the Favorites Bar and Favorites windowMnikolenko Productengine
2021-06-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-05-06Merge branch master (DRTVWR-515) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/skins/default/xui/en/strings.xml
2021-04-21Revert "SL-12475 add Inventory Favorites tab"Mnikolenko Productengine
2021-04-01Merge branch 'master' into DRTVWR-519Callum Prentice
2021-04-01Merge branch 'master' (DRTVWR-514) into DRTVWR-518-uiAndrey Kleshchev
# Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
2021-04-01Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-30SL-15050 Change name of toolbar button to "Guidebook"Mnikolenko Productengine
2021-03-16SL-14938 Remove Library and Inventory from Places floaterMnikolenko Productengine
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 06:35:44 +0000