Ansariel
|
fc5a86a6cc
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
|
2023-08-25 01:19:32 +02:00 |
|
Ansariel
|
6ee5d6053f
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/skins/default/xui/de/notifications.xml
|
2023-07-18 10:22:07 +02:00 |
|
Ansariel
|
e0c061d1c5
|
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/skins/default/xui/ja/control_table_contents_camera.xml
# indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
# indra/newview/skins/default/xui/ja/control_table_contents_editing.xml
# indra/newview/skins/default/xui/ja/control_table_contents_media.xml
# indra/newview/skins/default/xui/ja/control_table_contents_movement.xml
# indra/newview/skins/default/xui/ja/floater_about_land.xml
# indra/newview/skins/default/xui/ja/floater_adjust_environment.xml
# indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
# indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
# indra/newview/skins/default/xui/ja/floater_beacons.xml
# indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
# indra/newview/skins/default/xui/ja/floater_camera.xml
# indra/newview/skins/default/xui/ja/floater_camera_presets.xml
# indra/newview/skins/default/xui/ja/floater_conversation_log.xml
# indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
# indra/newview/skins/default/xui/ja/floater_create_landmark.xml
# indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
# indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
# indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
# indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml
# indra/newview/skins/default/xui/ja/floater_im_container.xml
# indra/newview/skins/default/xui/ja/floater_im_session.xml
# indra/newview/skins/default/xui/ja/floater_incoming_call.xml
# indra/newview/skins/default/xui/ja/floater_inspect.xml
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ja/floater_joystick.xml
# indra/newview/skins/default/xui/ja/floater_lagmeter.xml
# indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
# indra/newview/skins/default/xui/ja/floater_map.xml
# indra/newview/skins/default/xui/ja/floater_model_preview.xml
# indra/newview/skins/default/xui/ja/floater_moveview.xml
# indra/newview/skins/default/xui/ja/floater_my_environments.xml
# indra/newview/skins/default/xui/ja/floater_openobject.xml
# indra/newview/skins/default/xui/ja/floater_outfit_photo_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_people.xml
# indra/newview/skins/default/xui/ja/floater_perms_default.xml
# indra/newview/skins/default/xui/ja/floater_pick_track.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_preview_animation.xml
# indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
# indra/newview/skins/default/xui/ja/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/floater_profile.xml
# indra/newview/skins/default/xui/ja/floater_report_abuse.xml
# indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
# indra/newview/skins/default/xui/ja/floater_select_key.xml
# indra/newview/skins/default/xui/ja/floater_settings_debug.xml
# indra/newview/skins/default/xui/ja/floater_settings_picker.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_texture_ctrl.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_voice_volume.xml
# indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
# indra/newview/skins/default/xui/ja/floater_world_map.xml
# indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
# indra/newview/skins/default/xui/ja/menu_attachment_other.xml
# indra/newview/skins/default/xui/ja/menu_attachment_self.xml
# indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
# indra/newview/skins/default/xui/ja/menu_avatar_other.xml
# indra/newview/skins/default/xui/ja/menu_avatar_self.xml
# indra/newview/skins/default/xui/ja/menu_cof_gear.xml
# indra/newview/skins/default/xui/ja/menu_conversation.xml
# indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
# indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
# indra/newview/skins/default/xui/ja/menu_favorites.xml
# indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
# indra/newview/skins/default/xui/ja/menu_group_plus.xml
# indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
# indra/newview/skins/default/xui/ja/menu_im_conversation.xml
# indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
# indra/newview/skins/default/xui/ja/menu_inventory.xml
# indra/newview/skins/default/xui/ja/menu_inventory_add.xml
# indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml
# indra/newview/skins/default/xui/ja/menu_login.xml
# indra/newview/skins/default/xui/ja/menu_mini_map.xml
# indra/newview/skins/default/xui/ja/menu_object.xml
# indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
# indra/newview/skins/default/xui/ja/menu_participant_list.xml
# indra/newview/skins/default/xui/ja/menu_participant_view.xml
# indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
# indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
# indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
# indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
# indra/newview/skins/default/xui/ja/menu_people_nearby.xml
# indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
# indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
# indra/newview/skins/default/xui/ja/menu_picks.xml
# indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
# indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
# indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml
# indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
# indra/newview/skins/default/xui/ja/menu_save_settings.xml
# indra/newview/skins/default/xui/ja/menu_settings_gear.xml
# indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
# indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ja/menu_toolbars.xml
# indra/newview/skins/default/xui/ja/menu_url_agent.xml
# indra/newview/skins/default/xui/ja/menu_url_experience.xml
# indra/newview/skins/default/xui/ja/menu_url_group.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_wearing_tab.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_block_list_sidetray.xml
# indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
# indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml
# indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
# indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
# indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
# indra/newview/skins/default/xui/ja/panel_edit_shape.xml
# indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
# indra/newview/skins/default/xui/ja/panel_edit_universal.xml
# indra/newview/skins/default/xui/ja/panel_experience_info.xml
# indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml
# indra/newview/skins/default/xui/ja/panel_experience_list_item.xml
# indra/newview/skins/default/xui/ja/panel_experience_log.xml
# indra/newview/skins/default/xui/ja/panel_experience_search.xml
# indra/newview/skins/default/xui/ja/panel_experiences.xml
# indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/ja/panel_group_general.xml
# indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
# indra/newview/skins/default/xui/ja/panel_group_land_money.xml
# indra/newview/skins/default/xui/ja/panel_group_list_item.xml
# indra/newview/skins/default/xui/ja/panel_group_notices.xml
# indra/newview/skins/default/xui/ja/panel_group_notify.xml
# indra/newview/skins/default/xui/ja/panel_group_roles.xml
# indra/newview/skins/default/xui/ja/panel_landmark_info.xml
# indra/newview/skins/default/xui/ja/panel_landmarks.xml
# indra/newview/skins/default/xui/ja/panel_login.xml
# indra/newview/skins/default/xui/ja/panel_login_first.xml
# indra/newview/skins/default/xui/ja/panel_main_inventory.xml
# indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
# indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
# indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml
# indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
# indra/newview/skins/default/xui/ja/panel_people.xml
# indra/newview/skins/default/xui/ja/panel_places.xml
# indra/newview/skins/default/xui/ja/panel_postcard_message.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_alerts.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_controls.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_move.xml
# indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
# indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
# indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
# indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml
# indra/newview/skins/default/xui/ja/panel_profile_picks.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_experiences.xml
# indra/newview/skins/default/xui/ja/panel_region_terrain.xml
# indra/newview/skins/default/xui/ja/panel_script_ed.xml
# indra/newview/skins/default/xui/ja/panel_script_experience.xml
# indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml
# indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/ja/panel_settings_water.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
# indra/newview/skins/default/xui/ja/panel_sound_devices.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/role_actions.xml
# indra/newview/skins/default/xui/ja/sidepanel_appearance.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
# indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml
# indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml
# indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml
# indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
# indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml
# indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml
# indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
# indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
# indra/newview/skins/default/xui/ja/widgets/name_editor.xml
# indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml
# indra/newview/skins/default/xui/ja/widgets/person_view.xml
# indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
|
2023-07-18 00:48:02 +02:00 |
|
Ansariel
|
f00f624b8b
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
|
2023-07-18 00:45:10 +02:00 |
|
marchcat-pe
|
37f41392cd
|
Merge pull request #285 from secondlife/marchcat/SL-19669
INTL-490 Japanese Translation Update
|
2023-07-17 23:44:34 +03:00 |
|
Andrey Lihatskiy
|
07ff9a5d67
|
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
|
2023-07-17 23:17:29 +03:00 |
|
Andrey Lihatskiy
|
3790c9ed87
|
INTL-490 Japanese Translation Update
provided by Logue Takacs
|
2023-05-28 06:28:30 +03:00 |
|
Ansariel
|
137f5d145e
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.cpp
|
2023-05-18 14:03:52 +02:00 |
|
Ansariel
|
1d28a79ec6
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfilepicker.cpp
|
2023-05-18 13:43:48 +02:00 |
|
Ansariel
|
3fed8d9fc4
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llpathfindingnavmesh.cpp
|
2023-05-17 23:33:50 +02:00 |
|
Ansariel
|
61fffbf661
|
Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llinventory/llsettingswater.cpp
|
2023-05-17 18:05:52 +02:00 |
|
Andrey Lihatskiy
|
033b04f388
|
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.cpp
|
2023-05-17 18:05:05 +03:00 |
|
Andrey Lihatskiy
|
4dcab10bf8
|
Merge branch 'main' into DRTVWR-580-maint-T
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
|
2023-05-17 17:47:45 +03:00 |
|
Andrey Kleshchev
|
250228af25
|
SL-19660 Updated contributions doc
|
2023-05-09 17:58:13 +03:00 |
|
Ansariel
|
ce51a6b408
|
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llinventory/llsettingssky.cpp
# indra/newview/llappviewer.cpp
|
2023-05-05 09:38:09 +02:00 |
|
Andrey Kleshchev
|
7ebf98713c
|
SL-19681 Updated list of contributors
|
2023-05-03 19:53:38 +03:00 |
|
Ansariel
|
bee42f1fd0
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/newview/llappviewer.cpp
|
2023-05-03 10:58:47 +02:00 |
|
Ansariel
|
dd1940e9bc
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-05-03 10:05:23 +02:00 |
|
Ansariel
|
523662a5c8
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-05-02 18:22:32 +02:00 |
|
Ansariel
|
2a6c81f1d6
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-05-02 17:52:00 +02:00 |
|
Andrey Lihatskiy
|
ff8dcc23bf
|
Merge branch 'main' into DRTVWR-577-maint-S
|
2023-05-02 17:39:37 +03:00 |
|
Andrey Lihatskiy
|
504ef7e9e3
|
Merge branch 'main' into DRTVWR-580-maint-T
|
2023-05-02 17:39:29 +03:00 |
|
Andrey Lihatskiy
|
1444c4a23c
|
Merge branch 'main' into DRTVWR-582-maint-U
|
2023-05-02 17:39:13 +03:00 |
|
Ansariel
|
da32456165
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/skins/default/xui/en/strings.xml
|
2023-04-21 12:38:19 +02:00 |
|
Andrey Lihatskiy
|
f1095d7831
|
Merge branch 'main' into marchcat/main-contrib-merge
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/skins/default/xui/en/strings.xml
|
2023-04-07 00:20:59 +03:00 |
|
Ansariel
|
49c8ce2b07
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
|
2023-03-30 14:53:12 +02:00 |
|
Ansariel
|
c7fe346ff0
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llrender/llimagegl.cpp
|
2023-03-30 13:06:36 +02:00 |
|
Ansariel
|
36fc36432d
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/cmake/CMakeLists.txt
|
2023-03-30 12:20:59 +02:00 |
|
Andrey Lihatskiy
|
7b2205d8f6
|
Merge branch 'main' into DRTVWR-580-maint-T
|
2023-03-30 00:39:12 +03:00 |
|
Andrey Lihatskiy
|
5217e6bfb7
|
Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
|
2023-03-30 00:25:16 +03:00 |
|
Ansariel
|
aac7c60449
|
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewerwin32.cpp
|
2023-03-28 18:07:46 +02:00 |
|
Andrey Lihatskiy
|
d080ec2808
|
SL-4126 Updated contributions.txt
|
2023-03-22 19:09:26 +02:00 |
|
Ansariel
|
2c51fe5aad
|
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llvovolume.cpp
|
2023-03-22 17:35:43 +01:00 |
|
Ansariel
|
40b731eb76
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
# Conflicts:
# .gitignore
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
|
2023-03-21 10:57:56 +01:00 |
|
Andrey Lihatskiy
|
dca3c83cd9
|
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
|
2023-03-20 01:23:16 +02:00 |
|
Ansariel
|
adde408b18
|
Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llfloaterpreference.h
# indra/newview/llstartup.cpp
# indra/newview/llvovolume.cpp
|
2023-03-07 14:57:47 +01:00 |
|
Rye Mutt
|
cdb3c018af
|
SL-19336 Unload avatar and group icons from memory when not visible to reduce memory pressure on extremely large friends lists
|
2023-03-03 19:44:22 +02:00 |
|
Mnikolenko Productengine
|
7298a049a7
|
SL-19317 fix for avatar attachment accounting
|
2023-03-02 18:00:11 +02:00 |
|
Ansariel
|
f65cddf860
|
Merge branch 'contribute' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/lluuid.cpp
# indra/llcommon/lluuid.h
# indra/llprimitive/llmodel.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/llinventorymodel.cpp
# indra/newview/llviewerwearable.h
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/da/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/de/floater_perm_prefs.xml
# indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/en/strings.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
# indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/it/floater_perm_prefs.xml
# indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/ja/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/pl/floater_about.xml
# indra/newview/skins/default/xui/pl/floater_about_land.xml
# indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
# indra/newview/skins/default/xui/pl/floater_associate_listing.xml
# indra/newview/skins/default/xui/pl/notifications.xml
# indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml
# indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/pl/panel_profile_pick.xml
# indra/newview/skins/default/xui/pl/panel_profile_picks.xml
# indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/pl/panel_region_access.xml
# indra/newview/skins/default/xui/pl/panel_script_experience.xml
# indra/newview/skins/default/xui/pl/strings.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
# indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
|
2023-03-01 12:54:24 +01:00 |
|
Ansariel
|
7731ee8d50
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llmeshrepository.cpp
|
2023-02-28 12:44:49 +01:00 |
|
Ansariel
|
998dc17eff
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llfloatermarketplacelistings.cpp
# indra/newview/llfloatermarketplacelistings.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/skins/default/colors.xml
# indra/newview/skins/default/xui/en/floater_snapshot.xml
|
2023-02-14 17:32:34 +01:00 |
|
Andrey Kleshchev
|
4bc9331ddd
|
SL-19140 Fix contribution doc
|
2023-02-14 18:04:46 +02:00 |
|
Ansariel
|
2bc4fb2bf0
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/llui/llfolderviewitem.cpp
# indra/llui/llview.h
# indra/newview/llaisapi.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterproperties.cpp
# indra/newview/llfloaterproperties.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelmarketplaceinbox.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelinventory.cpp
# indra/newview/llsidepanelinventory.h
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/en/sidepanel_inventory.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
# indra/newview/skins/default/xui/en/sidepanel_task_info.xml
# indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
|
2023-02-13 23:35:21 +01:00 |
|
Andrey Kleshchev
|
0630e95ce7
|
SL-19207 Update contributions document
|
2023-02-13 20:37:20 +02:00 |
|
Andrey Kleshchev
|
6c54c9f8a9
|
Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
|
2023-02-09 22:33:52 +02:00 |
|
Andrey Kleshchev
|
a2f8f3db06
|
SL-19159 Update contribution doc
|
2023-02-07 23:55:22 +02:00 |
|
Ansariel
|
fb727de6e3
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/llmeshrepository.cpp
|
2023-02-03 22:33:41 +01:00 |
|
Ansariel
|
2ff9900cd9
|
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
|
2023-02-03 20:57:40 +01:00 |
|
Maxim Nikolenko
|
51142d1341
|
Merge branch 'main' into DRTVWR-567
# Conflicts:
# indra/newview/llappearancemgr.cpp
# indra/newview/llpanelmaininventory.cpp
|
2023-02-03 16:53:33 +02:00 |
|
Ansariel
|
06ac6c615c
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# .gitignore
# doc/contributions.txt
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llviewercontrol.cpp
# indra/newview/viewer_manifest.py
|
2023-02-03 15:34:47 +01:00 |