summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2022-05-18SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219Nat Goodspeed
Update task branch from main project branch.
2022-05-11SL-17356 Viewer changes for Premium Plus supportAndrey Lihatskiy
2022-05-04Merge branch master (D550) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/newview/llappviewer.h
2022-04-29SL-17124 switchContext and loadShaderFile crashesAndrey Kleshchev
- Do not try initializing shaders if requirements are not met or if window does not exist - Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close() - mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-18Merge branch master (D540) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp
2022-04-18Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-04-15SL-17219 WIP - Texture pipeline overhaulDave Parks
2022-03-30SL-17000 modify physics mesh dense/degenerate error msgDave Houlton
2022-03-29SL-17091 FIXED Walk/Run/Fly buttons are not clickableMnikolenko Productengine
2022-03-28SL-17000 improve error message for physics mesh importDave Houlton
2022-03-07Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-03-07Match error message updated on server side for SL-16869Brad Kittenbrink
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp
2022-02-18SL-16869 Removed unused LoginFailedAuthenticationFailedMFA message id.Brad Kittenbrink
2022-02-02SL-14769 Allow to log-in, even if there's an inventory errorMnikolenko Productengine
2022-01-14SL-16654 simplify MFA token prompt UI to use notifications instead of new ↵Brad Kittenbrink
custom floater.
2022-01-12SL-16614 Viewer's uploader crash with RenderGLCoreProfileAndrey Kleshchev
2022-01-11SL-16614 Viewer's uploader crash with RenderGLCoreProfileAndrey Kleshchev
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-15Merge remote-tracking branch 'origin/master' into brad/DRTVWR-550-mfaBrad Kittenbrink
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-14SL-16388 floater_mfa line wrapping fix when the server message is very longBrad Kittenbrink (Brad Linden)
2021-12-14SL-16388 Viewer MFA fix Duplicate Listener crash when first token challenge ↵Brad Kittenbrink
failed also cleaned up some xui warnings
2021-12-09SL-16471 Removed unneeded MeshOpt generation methodAndrey Kleshchev
2021-12-08SL-16105 Crash at LLTrackBlenderLoopingManual's setPositionAndrey Kleshchev
User opened editor, pressed play, according to logs environment wasn't loaded yet, asset had yet to arrive.
2021-12-08SL-16450 Don not crash viewer in case of invalid data typeAndrey Kleshchev
2021-12-06SL-16388 Viewer MFA Implementation ImprovementsBrad Kittenbrink
token input is now handled and message formatting is improved. Added beginnings of support for saving slmfa_hash value client side.
2021-12-03SL-16434 Fix menu localizationAndrey Kleshchev
2021-11-30SL-16369 Remove Hardware Skinning settingMnikolenko Productengine
2021-11-30SL-16119 update link textMnikolenko Productengine
2021-11-30SL-16119 Viewer should now direct IM 2 Email setting to webMnikolenko Productengine
2021-11-29DRTVWR-542 merge, purge GLOD copyrights from xmlDave Houlton
2021-11-29Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546Andrey Kleshchev
2021-11-23SL-16388 Viewer MFA ImplementationBrad Kittenbrink
We now present MFA errors to the user during login and prompt them for an authentication token.
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch master (DRTVWR-545) into DRTVWR-542-meshoptAndrey Kleshchev
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-11-10Merged DRTVWR-546 into SL-16329Vir Linden
2021-11-10SL-15521 Fix debian license file not mentioning meshoptimizerAndrey Kleshchev
Just in case
2021-11-10SL-14403 Removed glodAndrey Kleshchev
2021-11-10SL-16330 move VSync checkbox to General groupMnikolenko Productengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 15:27:22 +0000