diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-18 11:44:52 -0700 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-18 11:44:52 -0700 |
commit | 36ea92678e028abb54e02c603b657dfa10c91da1 (patch) | |
tree | 171e8a1ebdabda8dc30450e06506f461d74e53a7 /indra/newview | |
parent | 49ad7fd4b57cec635c557070be02556094e90ff6 (diff) |
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).
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index c9c7e94af9..6edda76ad2 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -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 |