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

FIRE-7075: Skin indicator letter next to the version number in support chats

meow-7.2.2
PanteraPolnocy 2013-01-05 04:37:37 +01:00
parent 0cd34a0c04
commit 897ae12a36
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llimfloater.cpp
View File

@ -257,9 +257,23 @@ void LLIMFloater::sendMsg()
static LLCachedControl<bool> chat_prefix(gSavedSettings, "FSSupportGroupChatPrefix2");
if (chat_prefix && FSData::getInstance()->isSupportGroup(mSessionID))
{
// <FS:PP> FIRE-7075: Skin indicator
static LLCachedControl<std::string> 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.
}
// </FS:PP>
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