aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:49 -0500
committerJacek Antonelli2008-08-15 23:45:49 -0500
commit8538c0f35dc5fb780f02930256e627e5266ede4a (patch)
tree58950646aae6534fafe680a5cf879d01cd99d254 /linden/indra/newview/llviewermessage.cpp
parentSecond Life viewer sources 1.20.5 (diff)
downloadmeta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.zip
meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.gz
meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.bz2
meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.xz
Second Life viewer sources 1.20.6
Diffstat (limited to 'linden/indra/newview/llviewermessage.cpp')
-rw-r--r--linden/indra/newview/llviewermessage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index e9f100e..a9adbcd 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1824,7 +1824,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
1824 } 1824 }
1825 break; 1825 break;
1826 case IM_BUSY_AUTO_RESPONSE: 1826 case IM_BUSY_AUTO_RESPONSE:
1827 // fix for JIRA issue VWR-20 submitted 13-JAN-2007 - Paul Churchill
1828 if (is_muted) 1827 if (is_muted)
1829 { 1828 {
1830 lldebugs << "Ignoring busy response from " << from_id << llendl; 1829 lldebugs << "Ignoring busy response from " << from_id << llendl;
@@ -1832,8 +1831,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
1832 } 1831 }
1833 else 1832 else
1834 { 1833 {
1835 // original code resumes 1834 // TODO: after LLTrans hits release, get "busy response" into translatable file
1836 gIMMgr->addMessage(session_id, from_id, name, message); 1835 snprintf(buffer, sizeof(buffer), "%s (%s): %s", name, "busy response", (message+message_offset)); /* Flawfinder: ignore */
1836 gIMMgr->addMessage(session_id, from_id, name, buffer);
1837 } 1837 }
1838 break; 1838 break;
1839 1839