b4104adf09
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-12-26 14:21:18 +01:00
3f74b107b3
FIRE-33532 Add the check for current PTT state in the mic toggle sound, in voice_follow_key
...
KEYSTATE_DOWN is called only once when using scroll wheel button, but if keybind is assigned to a keyboard key and the key is depressed, then it's called every frame. Simply check for the bool instead of playing around with KEYSTATE_LEVEL.
2023-12-17 18:17:49 +01:00
cdbcbf09e7
FIRE-33532 Cover the remaining cases for mic toggle: hotkey / mouse, activation/deactivation without PTT checkbox selected
2023-12-17 15:25:52 +01:00
195834eec3
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
2023-08-24 20:18:42 +02:00
2d64a54b1e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
2023-08-24 19:25:23 +02:00
d08859f3f4
Merge branch 'main' into DRTVWR-587-maint-V
...
# Conflicts:
# autobuild.xml
2023-08-23 22:28:01 +03:00
bbb1f32cfc
SL-20121 Fixed the crash in LLViewerInput::getKeyBindingAsString()
2023-08-04 01:44:44 +03:00
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
63151d5c6d
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/llurlentry.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llvoavatarself.h
2023-07-18 00:16:15 +02:00
4c89ad5586
SL-19306 A method of displaying user-customized keybindings in user-visible text
2023-07-17 15:46:18 +03:00
68a064431c
SL-19702 don't skip double clicks when clicking scripted objects
2023-07-12 12:44:23 +03:00
91b5fbcd66
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltabcontainer.cpp
# indra/newview/llagent.cpp
2023-07-12 11:06:47 +02:00
d80a1dee15
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
2023-07-07 21:16:55 +02:00
4aa44bdfc9
SL-19702 restore previous double clicking behavior for objects
2023-07-07 20:30:25 +03:00
5928afda8a
SL-19702 restore previous double clicking behavior for objects ( #266 )
2023-07-06 21:46:19 +03:00
a9c29b4b81
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmenugl.h
# indra/llui/lltexteditor.cpp
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llnetmap.cpp
2022-10-20 10:51:25 +02:00
46427eefd4
SL-17916 FIXED Unnecessary double click actions
2022-10-18 19:51:12 +03:00
ad0aa3422f
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-04-19 00:23:41 +02:00
fc90fee508
SL-16976 SL-443 Keybindings: Backward compatibility #3
2022-03-04 22:27:38 +02:00
93262cf286
DRTVWR-540 Merge follow up fix
2021-11-19 13:00:36 +02:00
d1d0ff3656
Fix merge
2021-11-19 11:00:50 +01:00
addec75adc
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-11-19 09:41:22 +01:00
1d9d378a9b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-19 09:08:43 +01:00
0dd4577013
DRTVWR-540 Post-merge build fix
2021-11-19 05:57:01 +02:00
49dd88e86c
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llviewerinput.cpp
2021-11-19 04:45:15 +02:00
cee218bd4a
Merge branch 'rlva/maintenance' into master
2021-11-18 18:37:32 +01:00
9a3340f5af
Post-merge fix up for @temprun, @alwaysrun and 'walk to clicked point'
2021-11-12 16:33:01 +01:00
7cdd463954
Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer
2021-09-20 13:16:41 +02:00
28e07331ac
SL-15594 Ignore voice keys when keybinding is waiting for a key
2021-09-17 23:15:14 +03:00
603e04ee3c
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 13:18:55 +02:00
6d05c44d71
SL-15791 Assigned walk_to or teleport_to sometimes prevents controls from triggering
2021-08-11 21:37:32 +03:00
10ba971b58
SL-15791 Double click was not causing CONTROL_LBUTTON_DOWN
2021-08-11 21:25:34 +03:00
f55821a6da
SL-15791 CONTROL_ML_LBUTTON and CONTROL_LBUTTON were triggered simultaneously
2021-08-11 01:46:00 +03:00
7ff7317779
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-02 09:35:11 +02:00
573c23488f
SL-15727 Mouse 'up' event was ignored
2021-07-30 01:21:21 +03:00
84a0ae682a
SL-15611 Do not ignore mask modifiers for mouse-teleporting
2021-07-21 22:15:12 +03:00
2d855a9fd7
SL-15594 Reimplement previous voice keybind behavior
...
Also fixed dupplicate checks
2021-07-16 22:59:08 +03:00
e7563ff13f
SL-443 Keybindings: Backward compatibility #2
2021-07-15 21:24:22 +03:00
48921a6232
SL-443 Keybindings: Backward compatibility
2021-07-15 20:22:53 +03:00
0814ba3322
SL-443 Keybindings: Support reassigment of script interaction button
2021-07-15 18:50:44 +03:00
04b6b6d1ba
SL-443 Keybindings: Do not error on unknown function
...
It is likely be from newer viewer / Preparations for SL-443 deloyment.
2021-07-15 18:49:58 +03:00
09f53a672b
SL-443 keybindings: Do not error on unknown function
...
It is likely be from newer viewer / Preparations for SL-443 deloyment.
2021-07-15 18:47:07 +03:00
7139d98927
Merge branch 'DRTVWR-514-keymappings' of https://bitbucket.org/lindenlab/viewer
2020-12-07 14:32:23 +01:00
4de5f6a853
SL-14455 FIXED Drag ground to turn is still active when Single click on land is set to No action
2020-12-03 17:10:50 +02:00
99daebb1de
SL-14456 FIXED Stop Moving action does not work in the custom key mappings viewer
2020-12-03 15:20:50 +02:00
ebe141327c
Merge branch 'DRTVWR-514-keymappings' of https://bitbucket.org/lindenlab/viewer
2020-06-24 10:30:51 +02:00
e6abf3dcb2
Mac buildfix
2020-06-23 14:51:28 +03:00
0b07e057b1
Buildfix
2020-06-23 14:51:28 +03:00
708fdb4e67
SL-6109 Mouse localization support
2020-06-23 14:50:59 +03:00
3ae6b2484e
Fix double-tab run right not working properly
2020-06-23 14:50:04 +03:00
Ansariel