summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2022-12-12Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-11-01SL-18448 Modified Material Editor to match overrides betterAndrey Kleshchev
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-548-maint-NAndrey Kleshchev
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-15SL-18153 Fixed bring to front multiple dialog handlingAndrey Kleshchev
2022-09-14SL-18153 Fix invisible blocking popupAndrey Kleshchev
Don't add popup to the list twice
2022-09-14SL-18153 Fix invisible blocking popupAndrey Kleshchev
Don't add popup to the list twice
2022-08-31Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
# Conflicts: # indra/newview/llfloateroutfitsnapshot.cpp
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-548-maint-NAndrey Lihatskiy
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
2022-08-17SL-17973 FIXED region name is not shown in the IM chatMnikolenko Productengine
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
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' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterworldmap.cpp # indra/newview/llvovolume.cpp
2022-08-04Merge branch master (DRTVWR-561) into DRTVWR-483Andrey Kleshchev
2022-08-04SL-17628 Added attachments can be moved past limit #2Andrey 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-26SL-17045 LSL editor cursor position desynchronizationAndrey Kleshchev
1. Fixed cursor position calculations 2. Fixed selection rect calculation
2022-07-19SL-16745 Some checkboxes are truncated after changing 'UI size'Andrey Kleshchev
2022-07-12SL-17759 Crash at LLProgressBar::drawAndrey Kleshchev
mImageBar and mImageFill are specified as optional
2022-07-09SL-17741 Paste is not disabled when copying 'no copy' itemsAndrey Kleshchev
We should allow to copy 'no copy' items for the ability to paste them as links, but regular 'paste' should be disabled in such case Also fixed library items enabling 'paste as link', we can not link library items.
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-548-maint-NAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llviewercontrol.cpp
2022-06-29Merge branch 'master' into DRTVWR-561-maint-OAndrey Lihatskiy
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-25SL-17628 Added attachments can be moved past limitAndrey Kleshchev
Support 'button up' when losing focus When releasing button far out of view or by refocusing something, button was not commiting. LLPanelObject last call was sendPosition(btn_down) with btn_down true which resulted in missed update. Now it will get one more call with btn_down==false.
2022-06-21SL-17635 remove unused variablesMaxim Nikolenko
2022-06-07SL-15312 Fixed group names not having paddingAndrey Kleshchev
Plus some focus and interactibility fixes
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-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-05-20SL-17425 Crash when closing two dependent floatersAndrey Kleshchev
dependent_it in llfloater was not valid after dependent floater removed itself from the list
2022-04-28Merge remote-tracking branch 'origin/euclid-17277' into ↵Brad Kittenbrink
brad/SL-17116-material-messaging
2022-04-28Beginning viewer side work for SL-17198 new asset and inventory types for ↵Brad Kittenbrink
Materials
2022-04-28Add a (broken) material upload handler fxnDave Houlton
2022-04-23SL-17270 FIXED Torn-off menus not getting update after operationMnikolenko 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 branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfloatersearch.cpp # indra/newview/llgroupactions.cpp # indra/newview/llvovolume.cpp
2022-04-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2022-04-18Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
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-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewermenu.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 10:50:44 +0000