summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerfloaterreg.cpp
AgeCommit message (Collapse)Author
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-03-01Merge branch 'main' into marchcat/yz-mergeAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorygallery.cpp
2023-12-18Merge branch 'main' into DRTVWR-594-maint-YAndrey Lihatskiy
2023-12-15Merge branch 'main' into DRTVWR-489Andrey Lihatskiy
# Conflicts: # indra/newview/fonts/DejaVu-license.txt # indra/newview/fonts/DejaVuSans-Bold.ttf # indra/newview/fonts/DejaVuSans-BoldOblique.ttf # indra/newview/fonts/DejaVuSans-Oblique.ttf # indra/newview/fonts/DejaVuSans.ttf # indra/newview/fonts/DejaVuSansMono.ttf
2023-12-05Merge branch 'main' into DRTVWR-489Alexander Gavriliuk
2023-11-30Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorygallery.cpp # indra/newview/skins/default/xui/en/notifications.xml
2023-11-29Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
2023-10-25SL-20109 Add inventory_thumbnails_helper floater to blacklist_untrustedAndrey Lihatskiy
2023-10-25Merge branch 'viewer_bulky_thumbs' into marchcat/maint-Y-bulky-thumbsAndrey Lihatskiy
# Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml
2023-10-08Merge branch main into DRTVWR-489Alexander Gavriliuk
2023-10-03Merge branch 'main' into DRTVWR-587-maint-VAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorymodel.cpp # indra/newview/llvovolume.cpp
2023-10-03Merge branch 'main' (DRTVWR-567) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-09-07SL-20273 IM, Offer Teleport, Map and Pay SLurls from external browser were ↵Andrey Kleshchev
blocked
2023-08-24Merge remote-tracking branch 'origin/main' into DRTVWR-489Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llmath/llvolume.cpp # indra/llrender/llgl.cpp # indra/llxml/llcontrol.cpp # indra/newview/llpanelnearbymedia.cpp # indra/newview/llsceneview.cpp # indra/newview/llselectmgr.cpp # indra/newview/llstartup.cpp # indra/newview/lltextureview.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml
2023-08-23Merge branch main (DRTVWR-582) into DRTVWR-567Andrey Kleshchev
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-23Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-08-21SL-20145 New inventory feature notificationAndrey Kleshchev
Pulled in relevant parts from SL-19929
2023-08-17Remove the original prototype tool Bulky Thumbs since it is now superceded ↵Callum Prentice
by the Inventory Thumbnail Helper tool
2023-08-11 SL-20109: Now that it seems that the tool might be useful, make a new ↵Callum Prentice
version with a proper name and start worknig on it. Prototype bulky thumbs one will be removed after new version is working
2023-08-01First commit of code to investigate how we might do bulk uploads of ↵Callum Prentice
inventory item thumbnails - both from a code and a UI perspective
2023-06-29SL-19929 New inventory feature notificationAndrey Kleshchev
2023-05-02MErge with main after Viewer releaseCallum Prentice
2023-05-02Merge branch 'main' into DRTVWR-567Andrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2023-05-02Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
2023-04-26Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539Brad Linden
2023-04-19SL-19609 Urls aren't dispatched according to the indicated gridAndrey Kleshchev
2023-04-14SL-19575 Create emoji gallery access iconAlexander Gavriliuk
2023-03-29SL-19479 Remove outfit photo preview and replace with a pop upAndrey Kleshchev
2023-03-02SL-19282 Removed LLInspectTexture floaterAndrey Kleshchev
LLInspectTexture floater appears to be incomplete and doesn't have a function
2023-02-24SL-19234 add Inventory settings floaterMaxim Nikolenko
2023-02-21SL-19108 Rename outfit snapshot floaterAndrey Kleshchev
2023-02-17SL-19108 WIP Managing inventory thumbnail #1Andrey Kleshchev
2023-02-08Merge branch 'xcode-14.1' into DRTVWR-489-emojiKitty Barnett
2023-02-08SL-19134 Remove llfloaterpropertiesAndrey Kleshchev
Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now
2023-02-03SL-19109 Decouple object profiles from inventoryAndrey Kleshchev
Potentially this won't stay as sidepanels, but such rework is planned for SL-19134, for now just making it possible to open multiple instances of item profiles
2023-02-03Merge branch 'main' into DRTVWR-567Maxim Nikolenko
# Conflicts: # indra/newview/llappearancemgr.cpp # indra/newview/llpanelmaininventory.cpp
2023-02-03Merge branch 'main' into DRTVWR-539Mnikolenko 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-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-02-01Add a texture inspector and show it when hovering over an inventory textory ↵Kitty Barnett
(or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures
2023-01-20Fix merge conflicts after auto mergeCallum Linden
2022-12-13Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/newview/llappviewer.cpp # indra/newview/skins/default/colors.xml
2022-12-12Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-11-09Merge branch contribution/emoji into DRTVWR-489-emojiKitty Barnett
2022-11-01SL-18448 Modified Material Editor to match overrides betterAndrey Kleshchev
2022-10-23Add mini emoji (auto-)complete helperKitty Barnett
2022-10-11SL-18165 Mac build fixAndrey Kleshchev
2022-10-11SL-18165 Tighten up some command permissionsAndrey Kleshchev
2022-09-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-09-13SL-18137 Open self profile when using app/openfloater/profileMnikolenko Productengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 05:05:33 +0000