1 files changed, 6 insertions, 2 deletions

diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 44d1ad1..1146c44 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -154,7 +154,7 @@ BOOL LLChatBar::postBuild()
                 mInputEditor->setPassDelete(TRUE);
                 mInputEditor->setReplaceNewlinesWithSpaces(FALSE);
 
-                mInputEditor->setMaxTextLength(1023);
+                mInputEditor->setMaxTextLength(DB_CHAT_MSG_STR_LEN);
                 mInputEditor->setEnableLineHistory(TRUE);
         }
 
@@ -624,8 +624,12 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
 
         LLWString out_text = stripChannelNumber(wtext, &channel);
         std::string utf8_out_text = wstring_to_utf8str(out_text);
-        std::string utf8_text = wstring_to_utf8str(wtext);
+        if (!utf8_out_text.empty())
+        {
+                utf8_out_text = utf8str_truncate(utf8_out_text, MAX_MSG_STR_LEN);
+        }
 
+        std::string utf8_text = wstring_to_utf8str(wtext);
         utf8_text = utf8str_trim(utf8_text);
         if (!utf8_text.empty())
         {