livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an option o disable auto-completion when typing @ mentions in chat

master
PanteraPolnocy 2025-10-23 16:33:22 +02:00
parent 3930c4b4c1
commit d4fd72e5ac
5 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llui/llchatmentionhelper.cpp
View File

@ -39,6 +39,13 @@ bool LLChatMentionHelper::isActive(const LLUICtrl* ctrl) const
bool LLChatMentionHelper::isCursorInNameMention(const LLWString& wtext, S32 cursor_pos, S32* mention_start_pos) const
{
// <FS:PP> Enable auto-completion of @ mentions
static LLUICachedControl<bool> useMentionAutoComplete("FSUseChatMentionAutoComplete", true);
if (!useMentionAutoComplete)
{
return false;
}
// </FS:PP>
if (cursor_pos <= 0 || cursor_pos > static_cast<S32>(wtext.size()))
return false;

2
indra/llui/llemojihelper.cpp
View File

@ -58,7 +58,7 @@ bool LLEmojiHelper::isActive(const LLUICtrl* ctrl_p) const
bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S32* pShortCodePos)
{
// <FS:PP> FIRE-33735: Option to suppress emoji chooser window from automatically popping up while typing in chat bars
static LLUICachedControl<bool> FSEnableEmojiWindowPopupWhileTyping("FSEnableEmojiWindowPopupWhileTyping");
static LLUICachedControl<bool> FSEnableEmojiWindowPopupWhileTyping("FSEnableEmojiWindowPopupWhileTyping", true);
if (!FSEnableEmojiWindowPopupWhileTyping)
{
return false;

11
indra/newview/app_settings/settings.xml
View File

@ -26469,6 +26469,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSUseChatMentionAutoComplete</key>
<map>
<key>Comment</key>
<string>Enable auto-completion when typing @ mentions in chat.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSUseBWEmojis</key>
<map>
<key>Comment</key>

8
indra/newview/skins/default/xui/en/panel_preferences_chat.xml
View File

@ -916,6 +916,14 @@
top_pad="1"
height="16"
width="400" />
<check_box
layout="topleft"
top_pad="1"
height="16"
width="400"
control_name="FSUseChatMentionAutoComplete"
name="FSUseChatMentionAutoComplete"
label="Enable automatic @ mentions window while typing in chat bars"/>
<check_box
layout="topleft"
top_pad="1"

1
indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
View File

@ -142,6 +142,7 @@
<check_box label="Włącz automatyczne odgadywanie imion w pasku czatu w pobliżu" name="FSChatbarNamePrediction"/>
<check_box name="AllowMUpose" label="&quot;:&quot; synonimem dla &quot;/me&quot;"/>
<check_box name="AutoCloseOOC" label="Domykaj ((nawiasy)) dla czatu OOC"/>
<check_box name="FSUseChatMentionAutoComplete" label="Automatyczne wyświetlanie okna wzmianek @ podczas pisania w paskach czatu"/>
<check_box name="FSEnableEmojiWindowPopupWhileTyping" label="Automatyczne wyświetlanie okna wyboru emoji podczas pisania w paskach czatu"/>
<check_box name="FSShowEmojiButton" label="Przycisk emoji w pasku czatu dla sesji IM i czatu w pobliżu"/>
<check_box name="FSShowIMSendButton" label="Przycisk wysyłania wiadomości w pasku czatu dla sesji IM"/>