From fdee7923f47729938cd839c1a7db6a7308ea78aa Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 25 Feb 2013 11:17:03 +0100
Subject: [PATCH] Re-added stuff gone missing in RLVa merge for option to
 display group chats, IM sessions and nearby chat always in uppercase

---
 indra/newview/llviewermessage.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 881c67ea1e..dccfb53d92 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4274,6 +4274,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 				{
 					mesg.erase(0, 1);
 					LLStringUtil::toLower(mesg);
+					allowConvertChatUppercase = false;
 
 					std::string strExecuted, strFailed, strRetained, *pstr;
 
@@ -4350,6 +4351,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 				if  ( (rlv_handler_t::isEnabled()) && (chatter) && (chat.mSourceType == CHAT_SOURCE_OBJECT) &&
 					  (gSavedSettings.getBOOL("EffectScriptChatParticles")) )
 				{
+					allowConvertChatUppercase = false;
 					LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
 					psc->setSourceObject(chatter);
 					psc->setColor(color);