Commit Graph

8 Commits (478a51f8e35b0f39923644e715cf98dfbcfded3e)

Author SHA1 Message Date
Ansariel 05d5e9f9da Make chat mention work with Firestorm nearby chat / IM floaters 2025-04-26 01:39:58 +02:00
Ansariel 5f1a19af72 Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
#	autobuild.xml
#	indra/linux_crash_logger/llcrashloggerlinux.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
Beq c874f17765 Defend against nullptr 2021-01-26 00:10:27 +00:00
Ansariel 730b19bd90 Rename FS-specific LLParticipantList to FSParticipantList 2015-05-15 11:25:47 +02:00
Ansariel 621117bbc6 Complete cleanup of fspanelimcontrolpanel.cpp/h 2013-08-07 17:29:51 +02:00
Ansariel 56c4dfde2f Removed old orphaned code from fspanelimcontrolpanel.cpp/h 2013-08-07 16:25:35 +02:00
Cinders b49d94e934 Use pre-chui LLParticipantList (in fsparticipantlist.*) 2013-06-28 21:17:28 -06:00
Ansariel 18124484c5 CHUI preparation phase 1 continued: Move FS-specific communication parts into a separate domain and out of the way for CHUI merge to reduce conflicts
* LLCallFloater moved to FSFloaterVoiceControls
* LLPanelIMControlPanel moved to FSPanelIMControlPanel
* floater_voice_controls.xml moved to floater_fs_voice_controls.xml
* panel_adhoc_control_panel.xml moved to panel_fs_adhoc_control_panel.xml
* panel_group_control_panel.xml moved to panel_fs_group_control_panel.xml
* panel_im_control_panel.xml moved to panel_fs_im_control_panel.xml
2013-03-01 11:32:01 +01:00