8a55580fc9
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/cmake/LLPhysicsExtensions.cmake
# indra/newview/llvoicewebrtc.cpp
2025-11-17 23:26:11 +01:00
40aaa885b7
FIRE-35938, FIRE-36013 Unchecking "Add objects on double click" still adds instead of replacing
...
Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
2025-11-16 18:38:07 +01:00
3620dfdd35
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-29 18:40:12 +01:00
3930c4b4c1
[FIRE-35996] Restore allowing creating folder from selected on recent and favorites inventory panels if they were in your clipboard
2025-10-21 18:22:10 +10:00
8a2c295298
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/skins/default/xui/en/panel_preferences_move.xml
# indra/newview/skins/default/xui/ja/floater_360capture.xml
# indra/newview/skins/default/xui/ja/floater_about_land.xml
# indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
# indra/newview/skins/default/xui/ja/floater_god_tools.xml
# indra/newview/skins/default/xui/ja/floater_inspect.xml
# indra/newview/skins/default/xui/ja/floater_joystick.xml
# indra/newview/skins/default/xui/ja/floater_land_holdings.xml
# indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
# indra/newview/skins/default/xui/ja/floater_model_preview.xml
# indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
# indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
# indra/newview/skins/default/xui/ja/floater_preferences.xml
# indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
# indra/newview/skins/default/xui/ja/floater_settings_debug.xml
# indra/newview/skins/default/xui/ja/floater_snapshot.xml
# indra/newview/skins/default/xui/ja/floater_stats.xml
# indra/newview/skins/default/xui/ja/floater_tools.xml
# indra/newview/skins/default/xui/ja/floater_top_objects.xml
# indra/newview/skins/default/xui/ja/floater_ui_preview.xml
# indra/newview/skins/default/xui/ja/menu_attachment_other.xml
# indra/newview/skins/default/xui/ja/menu_avatar_other.xml
# indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
# indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
# indra/newview/skins/default/xui/ja/menu_inventory.xml
# indra/newview/skins/default/xui/ja/menu_participant_list.xml
# indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
# indra/newview/skins/default/xui/ja/menu_profile_other.xml
# indra/newview/skins/default/xui/ja/menu_profile_self.xml
# indra/newview/skins/default/xui/ja/menu_settings_gear.xml
# indra/newview/skins/default/xui/ja/menu_url_agent.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
# indra/newview/skins/default/xui/ja/notifications.xml
# indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
# indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
# indra/newview/skins/default/xui/ja/panel_edit_universal.xml
# indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
# indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/ja/panel_group_notices.xml
# indra/newview/skins/default/xui/ja/panel_landmark_info.xml
# indra/newview/skins/default/xui/ja/panel_main_inventory.xml
# indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
# indra/newview/skins/default/xui/ja/panel_nearby_media.xml
# indra/newview/skins/default/xui/ja/panel_people.xml
# indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
# indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
# indra/newview/skins/default/xui/ja/panel_place_profile.xml
# indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
# indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
# indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
# indra/newview/skins/default/xui/ja/panel_preferences_general.xml
# indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
# indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
# indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/ja/panel_region_environment.xml
# indra/newview/skins/default/xui/ja/panel_region_estate.xml
# indra/newview/skins/default/xui/ja/panel_region_terrain.xml
# indra/newview/skins/default/xui/ja/panel_status_bar.xml
# indra/newview/skins/default/xui/ja/panel_tools_texture.xml
# indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
# indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
# indra/newview/skins/default/xui/ja/strings.xml
# indra/newview/skins/default/xui/ja/teleport_strings.xml
2025-10-13 22:21:27 +02:00
449f64caa2
#2818 Creating a link to an empty notecard fails
2025-10-13 18:17:05 +03:00
14ae64f297
Restore allowing creating folder from selected on recent and favorites inventory panels
2025-10-11 03:43:20 +10:00
8d220e4973
Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llmeshrepository.cpp
# indra/newview/viewer_manifest.py
2025-08-25 20:42:31 +02:00
548727ab00
#4537 Some links were missing favorite options
2025-08-15 18:37:52 +03:00
0871a8ed4a
Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llurlentry.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llvoavatar.cpp
2025-08-06 19:07:19 +02:00
84c62de95b
#4209 Outfits should have an "Add to Favorites" option
2025-07-23 22:15:39 +03:00
e0ffe6c160
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
2025-05-29 12:41:43 +02:00
7b770b1786
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/skins/default/xui/ja/strings.xml
2025-05-29 12:34:42 +02:00
b08ba3fa7b
Merge branch 'main' into marchcat/2505-merge
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/llui/llflatlistview.h
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
2025-05-28 21:38:00 +03:00
1513d97e55
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/skins/default/xui/en/floater_inventory_settings.xml
2025-05-23 12:44:50 +02:00
469795979f
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/colors.xml
2025-05-14 21:56:38 +02:00
32cd3a6088
#4071 Permit pasting links into outfits
...
Like it's permitted to drop them
2025-05-13 21:43:44 +03:00
6225eb8c86
#4060 Fix subfolders use through ctrl-v
2025-05-13 15:20:44 +03:00
e466414be4
#4055 Fix subfolder dragging
2025-05-13 15:20:44 +03:00
0f50e81c4d
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvieweraudio.cpp
# indra/newview/skins/default/xui/en/panel_preferences_chat.xml
2025-05-09 20:15:29 +02:00
37134720bc
#3757 Smarter subfolders dragndrop
2025-05-08 18:46:33 +03:00
00d612f430
#3993 Fix missing 'add to favorites' option
2025-04-29 17:16:31 +03:00
cf2f48de06
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llflatlistview.cpp
# indra/llui/llstyle.cpp
# indra/llui/llstyle.h
# indra/llui/lltextbase.cpp
# indra/llui/llurlmatch.cpp
# indra/llui/llurlmatch.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlist.h
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/colors.xml
2025-04-26 00:31:04 +02:00
4c355879cc
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewitem.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/newview/app_settings/settings.xml
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatermodelpreview.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfilter.cpp
# indra/newview/llinventoryfilter.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpaneloutfitedit.cpp
# indra/newview/llpaneloutfitsinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llpanelwearing.h
# indra/newview/llselectmgr.h
# indra/newview/llskinningutil.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerattachmenu.cpp
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerinventory.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llwearableitemslist.cpp
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_object_weights.xml
# indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/menu_outfit_tab.xml
# indra/newview/skins/default/xui/en/menu_wearing_tab.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/en/panel_outfits_list.xml
# indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
# indra/newview/skins/default/xui/en/panel_places.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/en/sidepanel_appearance.xml
# indra/newview/skins/default/xui/en/strings.xml
# indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
2025-04-16 17:49:47 +02:00
7d36e7103e
#3757 Disable ability to create folders in individual outfits
...
This part needs a recheck
2025-04-15 21:39:50 +03:00
ae93198735
Merge branch 'main' into marchcat/maint-c-restore
...
# Conflicts:
# indra/llcommon/lldate.h
# indra/newview/llappviewer.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmaterialeditor.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llvoavatar.cpp
2025-04-15 19:31:20 +03:00
03f622d0d4
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/skins/default/xui/en/strings.xml
2025-04-13 17:47:57 +02:00
7dce74fcfb
#3757 Move for subfodlers
2025-04-11 12:36:48 +03:00
2371994a88
#3757 Menu for subfodlers in outfits p2
2025-04-11 12:36:48 +03:00
1bb8fb2795
#3757 Menu for subfodlers in outfits
2025-04-11 12:36:48 +03:00
b95b20a1be
#3757 Allow subfolders in "My Outfits"
2025-04-11 12:36:48 +03:00
dab8b9c623
#3383 'InventoryAddAttachmentBehavior' setting should affect inventory panel in List view; update persistence of new settings
2025-04-11 00:33:13 +03:00
5d7a5001b4
Merge commit '9e24b30' into marchcat/maint-c/restore
...
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/llui/llfolderviewmodel.h
# indra/llui/llmodaldialog.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llagent.cpp
# indra/newview/llagentcamera.h
# indra/newview/llavatarrenderinfoaccountant.cpp
# indra/newview/llconversationmodel.h
# indra/newview/llfloaterinventorysettings.cpp
# indra/newview/llfloaternamedesc.cpp
# indra/newview/llfloaternamedesc.h
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llfolderviewmodelinventory.h
# indra/newview/llinspecttexture.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorygallery.h
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llteleporthistorystorage.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltexturefetch.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/tests/llviewerassetstats_test.cpp
2025-04-10 06:01:50 +03:00
4e2bfd7327
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llcallingcard.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/ja/strings.xml
# indra/newview/skins/default/xui/zh/strings.xml
2025-03-19 15:23:20 +01:00
f04992676d
#3685 add test floater for new slapps
2025-03-19 00:50:18 +02:00
750099db68
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llmessage/llproxy.cpp
# indra/llui/llfolderviewitem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llviewerprecompiledheaders.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/viewer_manifest.py
2025-03-12 19:31:51 +01:00
a925b178b0
triage#163 'Create folder from selected' misbehaves in marketplace
...
Marketplace deliberately doesn't allow creating folders and the "New
folder from selected" is a way of creating a new folder then moving
selected items inside, therefore shouldn't be allowed.
2025-03-11 03:13:10 +02:00
d8f3c242d4
viewer#1104 Crash at populateFoldersList
...
Ensure folder creation callbacks remain alive
# Conflicts:
# indra/newview/llfloatercreatelandmark.cpp
# indra/newview/llfloatercreatelandmark.h
2025-03-11 01:41:05 +02:00
7e7e19ee35
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorymodel.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/pipeline.cpp
2025-02-07 19:38:29 +01:00
046ec79d22
#3505 Make inventory run less content checks
2025-02-07 18:34:04 +02:00
df0634f0c4
#3505 Make checkFolderForContentsOfType cheaper
2025-02-07 18:34:04 +02:00
64b6587eec
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
2024-09-09 19:48:04 +02:00
2b7b81fbdb
#459 Filters on object inventory
2024-09-08 00:11:56 +02:00
e27ceba982
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-atlasaurus
2024-08-23 11:42:58 +02:00
f92f532026
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
2024-08-23 11:36:12 +02:00
830eeaa6ff
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llface.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewertexturelist.cpp
2024-08-21 00:46:46 +02:00
765652e337
FIRE-31508: Remove/move unneeded gets
2024-08-20 20:01:28 +01:00
9f7dd01772
Clean up boost includes and remove compiler warning pragma for unreachable code in PCH ( #2361 )
2024-08-20 18:41:48 +03:00
11cbf8a3dc
FIRE-31508: check folder limit before attaching all the things in a folder
2024-08-14 22:49:28 +01:00
55363703d1
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
...
# Conflicts:
# .github/workflows/build.yaml
# indra/newview/CMakeLists.txt
# indra/newview/llspeakers.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicewebrtc.cpp
2024-08-10 13:51:23 +02:00
Ansariel