From 897ae12a36d0b2ee68516eaecf0a165d92220ffc Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sat, 5 Jan 2013 04:37:37 +0100 Subject: [PATCH] FIRE-7075: Skin indicator letter next to the version number in support chats --- indra/newview/llimfloater.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index c76917cb92..1ddcb99733 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -257,9 +257,23 @@ void LLIMFloater::sendMsg() static LLCachedControl chat_prefix(gSavedSettings, "FSSupportGroupChatPrefix2"); if (chat_prefix && FSData::getInstance()->isSupportGroup(mSessionID)) { + + // FIRE-7075: Skin indicator + static LLCachedControl FSInternalSkinCurrent(gSavedSettings, "FSInternalSkinCurrent"); + std::string skinIndicator(FSInternalSkinCurrent); + if (skinIndicator == "starlightcui") + { + skinIndicator = "sc"; // Separate "s" (StarLight) from "sc" (StarLight CUI) + } + else + { + skinIndicator = skinIndicator.substr(0, 1); // "FS 4.4.1f os", "FS 4.4.1v", "FS 4.4.1a", "FS 4.4.1s os", "FS 4.4.1m os" etc. + } + // + if (utf8_text.find("/me ") == 0 || utf8_text.find("/me'") == 0) { - utf8_text.insert(4,("(FS " + LLVersionInfo::getShortVersion() + + utf8_text.insert(4,("(FS " + LLVersionInfo::getShortVersion() + skinIndicator + #ifdef HAS_OPENSIM_SUPPORT " os" + #endif @@ -267,7 +281,7 @@ void LLIMFloater::sendMsg() } else { - utf8_text.insert(0,("(FS " + LLVersionInfo::getShortVersion() + + utf8_text.insert(0,("(FS " + LLVersionInfo::getShortVersion() + skinIndicator + #ifdef HAS_OPENSIM_SUPPORT " os" + #endif