summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerchat.h
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-17 10:04:41 +0800
committerangela <angela@lindenlab.com>2009-11-17 10:04:41 +0800
commit28aa749db58b3a4095ca7e59811900767cd897b0 (patch)
tree82337af6ace682a5f5f5a7646f5dfd0dc44fa56a /indra/newview/llviewerchat.h
parent27a555e443c98ce1a41ef21e6111bdfe903894e8 (diff)
parentbce2cab144214b5a90a702e62f1e7c98e93fefc3 (diff)
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llviewerchat.h')
-rw-r--r--indra/newview/llviewerchat.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerchat.h b/indra/newview/llviewerchat.h
index d8840d5dd2..502d6ea7e5 100644
--- a/indra/newview/llviewerchat.h
+++ b/indra/newview/llviewerchat.h
@@ -45,8 +45,7 @@ public:
static void getChatColor(const LLChat& chat, std::string& r_color_name, F32& r_color_alpha);
static LLFontGL* getChatFont();
static S32 getChatFontSize();
-
-
+ static void formatChatMsg(const LLChat& chat, std::string& formated_msg);
};