diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 38909d6739..dc60596793 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -20841,17 +20841,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 2.0 - FSChatsUppercase - - Comment - Group chats, IM sessions and nearby chat always in uppercase. - Persist - 1 - Type - Boolean - Value - 0 - OpenRegionSettingsEnableDrawDistance Comment diff --git a/indra/newview/fonts/DejaVuSansAllCaps-Bold.ttf b/indra/newview/fonts/DejaVuSansAllCaps-Bold.ttf new file mode 100644 index 0000000000..1af8f602db Binary files /dev/null and b/indra/newview/fonts/DejaVuSansAllCaps-Bold.ttf differ diff --git a/indra/newview/fonts/DejaVuSansAllCaps-BoldOblique.ttf b/indra/newview/fonts/DejaVuSansAllCaps-BoldOblique.ttf new file mode 100644 index 0000000000..15f5b69fc7 Binary files /dev/null and b/indra/newview/fonts/DejaVuSansAllCaps-BoldOblique.ttf differ diff --git a/indra/newview/fonts/DejaVuSansAllCaps-Oblique.ttf b/indra/newview/fonts/DejaVuSansAllCaps-Oblique.ttf new file mode 100644 index 0000000000..60e2c22b9d Binary files /dev/null and b/indra/newview/fonts/DejaVuSansAllCaps-Oblique.ttf differ diff --git a/indra/newview/fonts/DejaVuSansAllCaps.ttf b/indra/newview/fonts/DejaVuSansAllCaps.ttf new file mode 100644 index 0000000000..a2bf8acb2a Binary files /dev/null and b/indra/newview/fonts/DejaVuSansAllCaps.ttf differ diff --git a/indra/newview/fonts/DejaVuSansAllCapsMono.ttf b/indra/newview/fonts/DejaVuSansAllCapsMono.ttf new file mode 100644 index 0000000000..ff70637300 Binary files /dev/null and b/indra/newview/fonts/DejaVuSansAllCapsMono.ttf differ diff --git a/indra/newview/fonts/fonts_deja_vu_all_caps.xml b/indra/newview/fonts/fonts_deja_vu_all_caps.xml new file mode 100644 index 0000000000..4f7ffb2a37 --- /dev/null +++ b/indra/newview/fonts/fonts_deja_vu_all_caps.xml @@ -0,0 +1,181 @@ + + + + + DejaVuSansAllCaps.ttf + + MSGOTHIC.TTC + gulim.ttc + simhei.ttf + ArialUni.ttf + seguisym.ttf + + + ヒラギノ角ゴ Pro W3.otf + ヒラギノ角ゴ ProN W3.otf + AppleSDGothicNeo-Regular.otf + AppleGothic.dfont + AppleGothic.ttf + 华文细黑.ttf + + + + + DejaVuSansAllCaps-Bold.ttf + + arialbd.ttf + + + Helvetica.dfont + + + + + DejaVuSansAllCaps.ttf + + arial.ttf + + + Helvetica.dfont + + + + + DejaVuSansAllCaps-Bold.ttf + + + + DejaVuSansAllCaps-Oblique.ttf + + + + DejaVuSansAllCaps-BoldOblique.ttf + + + + DejaVuSansAllCapsMono.ttf + + + + SourceCodePro-Regular.ttf + + + + ocra.ttf + + + + DejaVuSansAllCaps.ttf + + + + DejaVuSansAllCaps-Bold.ttf + + + + DejaVuSansAllCaps-Oblique.ttf + + + + DejaVuSansAllCaps-BoldOblique.ttf + + + + DejaVuSansAllCaps.ttf + + arial.ttf + + + arial.ttf + + + + + DejaVuSansAllCaps-Bold.ttf + + arialbd.ttf + + + arialbd.ttf + + + + + DejaVuSansAllCaps-Oblique.ttf + + ariali.ttf + + + ariali.ttf + + + + + DejaVuSans-BoldOblique.ttf + + arialbi.ttf + + + arialbi.ttf + + + + + times.ttf + DejaVuSansAllCaps.ttf + + + + + + + + + + diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp index edf4c00fc5..1c519756a7 100644 --- a/indra/newview/fschathistory.cpp +++ b/indra/newview/fschathistory.cpp @@ -971,8 +971,7 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL // FS:LO FIRE-2899 - Faded text for IMs in nearby chat //IRC styled /me messages. - bool irc_me = (prefix == "/me " || prefix == "/me'" - || prefix == "/ME " || prefix == "/ME'"); // + bool irc_me = (prefix == "/me " || prefix == "/me'"); // Delimiter after a name in header copy/past and in plain text mode std::string delimiter = ": "; @@ -1290,14 +1289,6 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL } // FS:LO FIRE-2899 - Faded text for IMs in nearby chat - // FIRE-7625: Option to display group chats, IM sessions and nearby chat always in uppercase - static LLCachedControl sFSChatsUppercase(gSavedSettings, "FSChatsUppercase"); - if (sFSChatsUppercase) - { - LLStringUtil::toUpper(message); - LLStringUtil::toUpper(mLastFromName); - } - // if (square_brackets) { message += "]"; diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 822f3dceb6..a8906ddaf1 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3858,6 +3858,7 @@ LLSD LLAppViewer::getViewerInfo() const else if (fsInternalFontSettingsFile == "fonts_mobi.xml") info["FONT"] = "Mobi Sans"; else if (fsInternalFontSettingsFile == "fonts_roboto.xml") info["FONT"] = "Roboto"; else if (fsInternalFontSettingsFile == "fonts_dyslexia.xml") info["FONT"] = "OpenDyslexic"; + else if (fsInternalFontSettingsFile == "fonts_deja_vu_all_caps.xml") info["FONT"] = "Deja Vu All Caps"; info["FONT_SIZE"] = gSavedSettings.getF32("FSFontSizeAdjustment"); info["FONT_SCREEN_DPI"] = gSavedSettings.getF32("FontScreenDPI"); diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index f6e7e94c66..9e30a26042 100755 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -837,14 +837,6 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id, LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, agent_id); std::string notify_msg = notification->getMessage(); - // FIRE-7625: Option to display group chats, IM sessions and nearby chat always in uppercase - static LLCachedControl oFSChatsUppercase(gSavedSettings, "FSChatsUppercase"); - if (oFSChatsUppercase) - { - LLStringUtil::toUpper(notify_msg); - } - // - LLIMModel::instance().proccessOnlineOfflineNotification(session_id, notify_msg); // If desired, also send it to nearby chat, this allows friends' // online/offline times to be referenced in chat & logged. diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 2d156eb312..9b3bf6eb66 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4470,10 +4470,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) } return; } - // FIRE-7625: Option to display group chats, IM sessions and nearby chat always in uppercase - static LLCachedControl aFSChatsUppercase(gSavedSettings, "FSChatsUppercase"); - bool allowConvertChatUppercase = true; - // // Look for IRC-style emotes if (ircstyle) @@ -4507,7 +4503,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) { mesg.erase(0, 1); LLStringUtil::toLower(mesg); - allowConvertChatUppercase = false; std::string strExecuted, strFailed, strRetained, *pstr; @@ -4584,7 +4579,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) if ( (rlv_handler_t::isEnabled()) && (chatter) && (chat.mSourceType == CHAT_SOURCE_OBJECT) && (gSavedSettings.getBOOL("EffectScriptChatParticles")) ) { - allowConvertChatUppercase = false; LLPointer psc = new LLViewerPartSourceChat(chatter->getPositionAgent()); psc->setSourceObject(chatter); psc->setColor(color); @@ -4604,25 +4598,14 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) case CHAT_TYPE_START: case CHAT_TYPE_STOP: LL_WARNS("Messaging") << "Got chat type start/stop in main chat processing." << LL_ENDL; - allowConvertChatUppercase = false; break; default: LL_WARNS("Messaging") << "Unknown type " << chat.mChatType << " in chat!" << LL_ENDL; - allowConvertChatUppercase = false; break; } chat.mText += mesg; } - - // FIRE-7625: Option to display group chats, IM sessions and nearby chat always in uppercase - if (aFSChatsUppercase && allowConvertChatUppercase) - { - std::string chatMessageUppercase = chat.mText; - LLStringUtil::toUpper(chatMessageUppercase); - chat.mText = chatMessageUppercase; - } - // // We have a real utterance now, so can stop showing "..." and proceed. if (chatter && chatter->isAvatar()) @@ -4637,14 +4620,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) LLViewerChat::formatChatMsg(chat, formated_msg); LLChat chat_bubble = chat; - // FIRE-7625: Option to display group chats, IM sessions and nearby chat always in uppercase - // Chat bubbles - if (aFSChatsUppercase && allowConvertChatUppercase) - { - LLStringUtil::toUpper(formated_msg); - } - // - chat_bubble.mText = formated_msg; ((LLVOAvatar*)chatter)->addChat(chat_bubble); } diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml index 0ae51c3d4e..dcf98af8ef 100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -20,7 +20,6 @@ - diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index ed9f12e2d0..fb6d84dea0 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -143,21 +143,13 @@ width="60" /> - diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml index 325ed1be44..6426ffd6b6 100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml @@ -20,7 +20,6 @@ - diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_UI.xml b/indra/newview/skins/default/xui/ja/panel_preferences_UI.xml index 5db6945d49..7f1c323d82 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_UI.xml @@ -152,14 +152,6 @@ フォント種類： - - - - - - - - （再起動が必要） diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml index d5f51ac98d..4f2165a239 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml @@ -21,7 +21,6 @@ - diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml index 2830eea1a7..280cdba7f9 100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml @@ -20,7 +20,6 @@ -