3620dfdd35
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-29 18:40:12 +01:00
d4fd72e5ac
Add an option o disable auto-completion when typing @ mentions in chat
2025-10-23 16:33:22 +02:00
5c03f284af
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/APR.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/newview/llsurface.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/viewer_manifest.py
2025-10-18 13:01:08 +02:00
167b7bae62
#3263 Repeat Notification Noise on Find Emoji Floater
2025-10-15 11:21:25 +03:00
82b05f1063
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llfloater.h
# indra/newview/llfloatersnapshot.h
# indra/newview/llstatusbar.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/de/strings.xml
# indra/newview/skins/default/xui/en/floater_snapshot.xml
# indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
# indra/newview/skins/default/xui/es/strings.xml
# indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/fr/strings.xml
# indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/it/strings.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/strings.xml
# indra/newview/skins/default/xui/pt/strings.xml
# indra/newview/skins/default/xui/ru/strings.xml
# indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/zh/strings.xml
# scripts/messages/message_template.msg
# scripts/messages/message_template.msg.sha1
2025-03-31 23:55:28 +02:00
5608c3998d
viewer#2270 The "More" button does not close the "Choose emoji" floater
2025-03-19 21:55:01 +02:00
a944a7b54a
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llui/llemojihelper.cpp
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2024-08-02 15:39:34 +02:00
a134e850c1
Disable EmojiHelper if Digit before Colon ( #2178 )
...
* Disable EmojiHelper if Digit before Colon
Typing in times with the new emoji helper pop-up can be frustrating, so I would like to propose disabling it when there is a number before the colon.
* Remove trailing space in indra/llui/llemojihelper.cpp
---------
Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
2024-08-02 13:33:00 +03:00
f3fccdacea
Switch the check, neater fix, thanks Zi.
2024-06-10 19:01:09 +01:00
e36a47d568
Be defensive and a little paranoid around the emoji floater
...
This avoid ths crash but does not address why the xml reader appears to misread occasionally.
2024-06-10 14:27:25 +01:00
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
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
bb97024300
FIRE-33773 - avoid OOB access under certain conditions
2024-03-16 19:57:22 +00:00
ebcafcfa58
Not doing it half-way would help...
2024-03-04 16:04:15 +01:00
5a0b671cc1
FIRE-33735: Option to suppress emoji chooser window from automatically popping up while typing in chat bars
2024-03-04 00:14:21 +01:00
f6ceafee5b
SL-20416 Avoid of taking focus by EmojiPicker
2024-01-24 00:07:10 +03:00
be655fef7f
:x
2023-10-03 14:23:38 +02:00
f36f50462e
SL-20387 Show Emoji Completion floater at the beginning of the shortcode
2023-10-02 14:38:11 +02:00
ff7ebf0892
SL-19575 Create emoji gallery access icon
2023-04-14 17:27:30 +02:00
81dd143d0d
[FIXED] Various minor issues
...
- Typing 👍 doesn't replace the short code with the thumbs-up emoji
- Moving the mouse over the emoji complete panel highlights the wrong emoji when mScrollPos > 0
- Emoji complete panel is missing attributes
- Crash when attempting to show the tooltip for an emoji text segment
- Emoji autocomplete panel can sometimes show empty (type ':cat', select the heart eyed one, Ctrl-Z and then type 2 which should show the emoji for :cat2 but shows an empty square instead)
2022-11-08 01:05:01 +01:00
c40d3351d5
Commit immediately if the user already typed a full shortcode
2022-11-02 19:08:02 +01:00
fb1553d8cf
Cannot use the :+1 emoji shortcode
2022-10-23 16:29:29 +02:00
58cdcd5dd2
Handle return and escape in the mini emoji helper
2022-10-23 16:29:12 +02:00
dad25bcb1e
Add the emoji helper class which can be used by text-input controls to provide emoji picker support
2022-10-23 16:28:25 +02:00
Ansariel