summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
AgeCommit message (Collapse)Author
2022-12-13Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/newview/llappviewer.cpp # indra/newview/skins/default/colors.xml
2022-09-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-06SL-18097 Don't permit multiple instances of 'unsaved changes' popupsAndrey Kleshchev
Make notifications modal. When multiple ones are visible, first popup works, interacting with second one causes a crash. And it shouldn't be possible to change anything in floater when these notifications are visible
2022-09-06SL-18097 Don't permit multiple instances of 'unsaved changes' popupsAndrey Kleshchev
Make notifications modal. When multiple ones are visible, first popup works, interacting with second one causes a crash. And it shouldn't be possible to change anything in floater when these notifications are visible
2022-08-31Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
# Conflicts: # indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
2022-08-19SL-17990 Give user a popup warning when they attach a rigged mesh object to ↵Mnikolenko Productengine
an HUD
2022-08-04Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-08-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-08-04Merge branch master (DRTVWR-561) into DRTVWR-483Andrey Kleshchev
2022-08-04Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-08-02SL-17851 Highlight matching notifications when using Search Box in PreferenceMnikolenko Productengine
2022-07-11SL-17665 additional checks to avoid moving protected foldersMnikolenko Productengine
2022-07-04SL-17665 Add operation to create a subfolder from selected items in InventoryMnikolenko Productengine
2022-06-02SL-15312 Confirm usaved changes dialog when closing floaterAndrey Kleshchev
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-561-maint-OAndrey Lihatskiy
2022-05-11SL-12238 - error message to match new limitsHoward Stearns
2022-05-05Merge branch 'DRTVWR-546' into DRTVWR-539Mnikolenko Productengine
2022-05-04Merge branch master (D550) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/newview/llappviewer.h
2022-05-04Merge branch 'master' into DRTVWR-561-maint-OAndrey Lihatskiy
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-26Merge branch 'DRTVWR-546' into DRTVWR-539Mnikolenko Productengine
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-18Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2022-03-17SL-16627 show auto-adjustment warning when for Shadows quality and Water ↵Mnikolenko Productengine
reflection settings
2022-03-07Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-03-02Merge branch 'DRTVWR-546' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/llcommon/tests/llprocess_test.cpp # indra/llui/llcombobox.cpp # indra/llui/llcombobox.h # indra/newview/VIEWER_VERSION.txt # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-03-02Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
# 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-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-486Andrey Lihatskiy
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-04SL-15923 increase the shortcut level to the minimum required when clicking ↵Mnikolenko Productengine
advanced lighting or shadows settings
2022-02-02SL-14769 Allow to log-in, even if there's an inventory errorMnikolenko Productengine
2022-01-24SL-16627 AutoFPS first passMnikolenko 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
2021-12-08SL-16450 Don not crash viewer in case of invalid data typeAndrey Kleshchev
2021-09-11SL-15964 Simple test for compression libraryAndrey Kleshchev
2021-07-23Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-07-12SL-14795 Remove landmark notification in nearby chatMnikolenko Productengine
2021-06-25Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorypanel.cpp
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp
2021-06-07Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 10:01:07 +0000