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

CHUI-329: The text is now gray due to CHUI 410. The only change in this commit is that parenthesis surround the nearby chat text (Nearby chat).

meow-7.2.2
Gilbert Gonzales 2012-10-18 11:44:52 -07:00
parent 49ad7fd4b5
commit 36ea92678e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llimfloatercontainer.cpp
View File

@ -1175,8 +1175,18 @@ void LLIMFloaterContainer::setNearbyDistances()
void LLIMFloaterContainer::addConversationListItem(const LLUUID& uuid, bool isWidgetSelected /*= false*/)
{
bool is_nearby_chat = uuid.isNull();
std::string display_name = is_nearby_chat ? LLTrans::getString("NearbyChatTitle") : LLIMModel::instance().getName(uuid);
std::string display_name;
//Stores the display name for the conversation line item
if(is_nearby_chat)
{
//Adds parenthesis in code since these are independent of the translated string
display_name = "(" + LLTrans::getString("NearbyChatTitle") + ")";
}
else
{
display_name = LLIMModel::instance().getName(uuid);
}
// Check if the item is not already in the list, exit if it is and has the same name and uuid (nothing to do)
// Note: this happens often, when reattaching a torn off conversation for instance