Age | Commit message (Collapse) | Author | |
---|---|---|---|
2023-04-26 | Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539 | Brad Linden | |
2023-03-31 | Merge branch 'main' into DRTVWR-539 | Mnikolenko Productengine | |
# Conflicts: # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/llfloateravatarrendersettings.cpp | |||
2023-03-29 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2023-03-27 | SL-17761 Updated the login failure message | Andrey Lihatskiy | |
2023-03-13 | SL-17761: Replace 'Grid emergency' message with generic error | Bennett Goble | |
The viewer currently presents a startling "Grid emergency" warning if an unrecognized error is returned from login. Let's tone this down a bit and present the error as it is: an unrecognized login failure rather than SLearth exploding. | |||
2023-02-08 | DRTVWR-559 Remove some 32-bit color paranoia checks (potential fix for ↵ | Dave Parks | |
running under wine) | |||
2023-02-03 | Merge branch 'main' into DRTVWR-539 | Mnikolenko Productengine | |
# Conflicts: # doc/contributions.txt # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt | |||
2023-02-02 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2022-12-13 | Merge branch 'main' into DRTVWR-539 | Mnikolenko Productengine | |
# Conflicts: # doc/contributions.txt # indra/newview/llappviewer.cpp # indra/newview/skins/default/colors.xml | |||
2022-12-12 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2022-12-12 | Merge branch 'main' into DRTVWR-570-maint-Q | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp | |||
2022-12-01 | SL-18725 Texture picker should explain why dropping texture isn't allowed | Andrey Kleshchev | |
Show a tooltip on drag&drop | |||
2022-11-08 | SL-18197 Bump inventory cache version | Andrey Kleshchev | |
Issue: release viewer saves materials as AT_UNKNOWN (255). When material viewer loads cache with materials saved as '255' instead of '57', material viewer doesn't know to update content and it casuses issues. Viewer eventally recovers, but it's simpler to drop cache in this case over trying to figure out if our unknown is a material (but may be cache should include asset type count to let viewer know when to double check unknowns). Also made 'legacy' materials folder's name localizable just in case. | |||
2022-10-07 | SL-18311 Change "Upgrade to Premium" label in menu | Andrey Kleshchev | |
2022-09-21 | Merge branch 'master' into DRTVWR-539 | Mnikolenko Productengine | |
2022-09-16 | Merge branch master (DRTVWR-571) into DRTVWR-559 | Andrey Kleshchev | |
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h | |||
2022-09-16 | SL-18161 Change pbr folder name | Andrey Kleshchev | |
2022-09-15 | SL-18161 Fix missing folder name localizations | Andrey Kleshchev | |
2022-09-15 | Merge branch 'master' into DRTVWR-565-maint-P | Andrey Lihatskiy | |
2022-08-31 | Merge branch 'master' into DRTVWR-565-maint-P | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llfloateroutfitsnapshot.cpp | |||
2022-08-31 | Merge branch master (DRTVWR-483) into DRTVWR-559 | Andrey Kleshchev | |
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps* | |||
2022-08-31 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp | |||
2022-08-08 | SL-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-08-03 | SL-17890 readable warning for MAV_BLOCK_MISSING | Andrey Kleshchev | |
2022-07-11 | SL-17640 Fixed missing asset string | Andrey Kleshchev | |
2022-06-29 | Merge branch 'master' (DRTVWR-543) into DRTVWR-559 | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp | |||
2022-06-29 | Merge branch 'master' into DRTVWR-539 | Mnikolenko Productengine | |
2022-06-29 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
2022-06-29 | Merge branch 'master' (DRTVWR-543) into DRTVWR-483 | Andrey Kleshchev | |
# Conflicts: # indra/newview/llviewertexturelist.cpp | |||
2022-06-24 | SL-17650 Add Material as a filter option to Inventory filter floater | Mnikolenko Productengine | |
2022-06-14 | SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons. | Dave Parks | |
2022-05-31 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h | |||
2022-05-26 | Merge branch 'master' into DRTVWR-539 | Mnikolenko Productengine | |
2022-05-26 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llviewertexturelist.cpp | |||
2022-05-11 | SL-15312 Profiles tweaks | Andrey 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-11 | SL-17356 Viewer changes for Premium Plus support | Andrey Lihatskiy | |
2022-05-06 | SL-17356 Viewer changes for Premium Plus support | Andrey Lihatskiy | |
2022-05-05 | Merge branch 'DRTVWR-546' into DRTVWR-539 | Mnikolenko Productengine | |
2022-05-04 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
# Conflicts: # indra/viewer_components/login/lllogin.cpp | |||
2022-05-04 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2022-05-04 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
2022-04-07 | SL-17171 Display Marketplace Error Messages only when trying to use Marketplace | Andrey Kleshchev | |
2022-03-07 | Match error message updated on server side for SL-16869 | Brad Kittenbrink | |
2022-02-18 | SL-16869 Removed unused LoginFailedAuthenticationFailedMFA message id. | Brad Kittenbrink | |
2022-01-14 | SL-16654 simplify MFA token prompt UI to use notifications instead of new ↵ | Brad Kittenbrink | |
custom floater. | |||
2021-12-26 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
2021-12-26 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2021-12-20 | Merge branch 'master' into DRTVWR-544-maint | Mnikolenko Productengine | |
2021-12-20 | Merge branch 'master' into DRTVWR-539 | Mnikolenko Productengine | |
2021-11-16 | Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/app_settings/settings.xml |