diff options
author | McCabe Maxsted | 2010-09-08 20:51:56 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-09-10 19:10:37 -0700 |
commit | d8a02396cad94a191a7cea0f710217615f8cfc93 (patch) | |
tree | b9edc32a2fafc7d29dd4a96f0ee56e9b0b231a79 | |
parent | Port from Emerald: allow any key for gestures (diff) | |
download | meta-impy-d8a02396cad94a191a7cea0f710217615f8cfc93.zip meta-impy-d8a02396cad94a191a7cea0f710217615f8cfc93.tar.gz meta-impy-d8a02396cad94a191a7cea0f710217615f8cfc93.tar.bz2 meta-impy-d8a02396cad94a191a7cea0f710217615f8cfc93.tar.xz |
Updated the formatting for group IMs to make it clear they're IMs
-rwxr-xr-x | linden/indra/newview/llviewermessage.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp index ec6d4d4..bfd1045 100755 --- a/linden/indra/newview/llviewermessage.cpp +++ b/linden/indra/newview/llviewermessage.cpp | |||
@@ -2316,8 +2316,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) | |||
2316 | std::string group_name; | 2316 | std::string group_name; |
2317 | if (gAgent.isInGroup(session_id) && gSavedSettings.getBOOL("ShowGroupNameInChatIM")) | 2317 | if (gAgent.isInGroup(session_id) && gSavedSettings.getBOOL("ShowGroupNameInChatIM")) |
2318 | { | 2318 | { |
2319 | group_name = std::string((char*)binary_bucket); | 2319 | if (!(gCacheName->getGroupName(from_id, group_name))) |
2320 | chat.mText = std::string("[") + group_name + std::string("] ") + name | 2320 | { |
2321 | group_name = std::string((char*)binary_bucket); | ||
2322 | } | ||
2323 | chat.mText = std::string("IM [") + group_name + std::string("] ") + name | ||
2321 | + separator_string + saved + message.substr(message_offset); | 2324 | + separator_string + saved + message.substr(message_offset); |
2322 | } | 2325 | } |
2323 | else | 2326 | else |