livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
73,413 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

182 Commits (9abf29e9955b2ca039482ca2cb3fcffbe7375175)

Author SHA1 Message Date
Ansariel dd3b29d82c Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2024-02-14 18:05:08 +01:00
Alexander Gavriliuk b4e29ec0e9 #68 The 'Recently used emoji' can not be selected by the 'Tab' key 2024-02-09 16:16:01 +03:00
Ansariel 394c8e17d5 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/lltextbase.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/floater_emoji_picker.xml
 2024-01-26 00:32:06 +01:00
Alexander Gavriliuk c5f4eb32a9 SL-20416 Use image from file for emoji_recent_panel_toggle_btn 2024-01-24 17:50:43 +01:00
Alexander Gavriliuk f6ceafee5b SL-20416 Avoid of taking focus by EmojiPicker 2024-01-24 00:07:10 +03:00
Ansariel f072b3f952 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-11-30 19:16:29 +01:00
Alexander Gavriliuk 337b2fcc36 Mac build fix 2023-11-28 00:33:34 +01:00
Ansariel 548faf2966 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/llfloater.cpp
 2023-11-15 16:38:15 +01:00
Alexander Gavriliuk 1ef524986f SL-20416 Choose emoji floater puts emoji in the chat window that opened it 2023-11-10 03:38:44 +01:00
Alexander Gavriliuk 88b15ff62c SL-20521 Focus does not move to the Nearby Chat field 2023-11-10 03:35:39 +01:00
Alexander Gavriliuk 93e4d069d1 SL-20518 EmojiPicker - The 'More' button is overlapped the recently used emojis row after narrowing back the 'Conversations' floater 2023-11-08 18:05:45 +01:00
Alexander Gavriliuk 2e0892e530 SL-20356 Show tooltip for the empty-recent textbox 2023-11-07 08:58:42 +01:00
Ansariel 478cbd595b Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llpanelemojicomplete.cpp
#	indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
 2023-10-04 16:17:22 +02:00
Alexander Gavriliuk 66aee79e3e SL-20348 Focus should be in the chat bar when the Conversations floater is opened 2023-10-04 09:50:55 +02:00
Maxim Nikolenko 988278b8c3
SL-20358 restore focus after opening recent emoji panel 2023-10-02 15:54:22 +03:00
Ansariel 5e82c81322 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-09-22 11:01:55 +02:00
Alexander Gavriliuk c40f63911c SL-20294 The row of recent emojis displays the recently sent emoji only after clicking the collapsing smiley button 2023-09-22 01:29:32 +02:00
Ansariel b118128e83 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_emoji_picker.xml
 2023-09-20 14:18:43 +02:00
Alexander Gavriliuk 0e135d2a2c SL-20247 Keep the focus on the chat field as emojis in the offboard floater are clicked 2023-09-13 18:19:50 +02:00
Ansariel e7549d3951 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_emoji_picker.xml
 2023-08-30 19:04:09 +02:00
Alexander Gavriliuk 44098db8b3 SL-20210 Recent Emojis - Remember emojis that were actually sent in the message 2023-08-30 12:16:46 +02:00
Alexander Gavriliuk f18746a175 SL-20209 EmojiPicker - Show 'Recent' panel instead of the floater on click the button 2023-08-30 03:14:32 +02:00
Ansariel fee03db3cb Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-07-29 13:17:19 +02:00
Alexander Gavriliuk 264d9c32d9 SL-20088 EmojiPicker - replace the image on the activation button with an emoji 2023-07-28 22:29:01 +02:00
Callum Prentice c5d7f3c4c1 DRTVWR-489: trivial merge conflict fix 2023-07-18 10:51:51 -07:00
Ansariel 181ac13338 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llerrorthread.cpp
 2023-07-18 11:09:03 +02:00
Ansariel 1e4f4dea32 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	README.md
#	indra/llcommon/llsdserialize.h
#	indra/llui/lltextbase.cpp
 2023-05-18 13:23:19 +02:00
Alexander Gavriliuk 671978e392 SL-19575 Create emoji gallery (fix bug with drawing emojis in chat history) 2023-05-17 19:06:57 +02:00
Ansariel 719a2d31dc Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llui/llscrolllistctrl.h
#	indra/newview/CMakeLists.txt
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/textures/textures.xml
 2023-04-22 12:02:23 +02:00
Alexander Gavriliuk 97b0ba2a6d SL-19575 LLFloaterEmojiPicker - Add filter by category 2023-04-20 03:55:02 +02:00
Alexander Gavriliuk ff7ebf0892 SL-19575 Create emoji gallery access icon 2023-04-14 17:27:30 +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
Andrey Kleshchev 23a781317a SL-19196 Nearby chat bar moves down every time it gains focus 2023-02-14 02:46:24 +02:00
Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloater360capture.cpp
 2022-12-12 22:09:54 +01:00
Andrey Lihatskiy f836194516 Merge branch 'main' into DRTVWR-570-maint-Q 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
 2022-12-12 20:53:11 +02:00
Ansariel 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
Rye Mutt b9552e596f Reduce folderview menu bloat via lazy creation on right click 2022-10-19 16:21:05 -04:00
Ansariel 7d0d744e34 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/featuretable_linux.txt
#	indra/newview/llagent.cpp
#	indra/newview/llfloatertranslationsettings.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2022-09-13 19:37:45 +02:00
Mnikolenko Productengine eba7d0cb58 SL-18102 Remove 'Translate chat' checkbox from chat 2022-09-07 19:24:12 +03:00
Andrey Kleshchev 2b3bc13074 SL-17760 Crash at LLFolderViewItem::refresh(318) 
and at LLFolderViewItem::postBuild for LLConversationViewParticipant
 2022-07-16 14:37:34 +02:00
Andrey Kleshchev c287bc0a86 SL-17760 Crash at LLFolderViewItem::refresh(318) 
and at LLFolderViewItem::postBuild for LLConversationViewParticipant
 2022-07-13 00:08:41 +03:00
Ansariel ad0aa3422f Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-04-19 00:23:41 +02:00
Andrey Kleshchev b9ac5b8ac4 SL-16992 Crash at LLVivoxVoiceClient::notifyStatusObservers 2022-03-09 21:11:19 +02:00
Ansariel 969762f162 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 16:29:50 +01:00
Andrey Lihatskiy 30c381406c Merge branch 'master' into DRTVWR-530-maint 
# Conflicts:
#	doc/contributions.txt
 2021-11-16 01:09:11 +02:00
Ansariel 1536fdd1c3 Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-24 10:47:18 +02:00
Mnikolenko Productengine 4fc4d965c1 SL-15868 FIXED Crash in LLFloaterIMSessionTab::enableDisableCallBtn 2021-08-23 17:46:38 +03:00
Ansariel 7ff7317779 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-02 09:35:11 +02:00
Andrey Kleshchev 7956f7bfd3 SL-15458 Avatars who are moderators appear twice in popped-out IM session floater 2021-06-25 22:14:33 +03:00
Ansariel c516f1fc9a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-02 13:50:45 +02:00