From fe37eb66ef31504caee4f6445dc2f2142c0e7d60 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 25 Jan 2020 10:23:32 +0100
Subject: [PATCH] FIRE-29244: Chat keywords don't work properly if keyword list
 contains whitespaces for readability; based on a patch by Testicular
 Slingshot

---
 indra/newview/fskeywords.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fskeywords.cpp b/indra/newview/fskeywords.cpp
index 361ddfbd16..88269625cf 100644
--- a/indra/newview/fskeywords.cpp
+++ b/indra/newview/fskeywords.cpp
@@ -63,13 +63,16 @@ void FSKeywords::updateKeywords()
 	mWordList.clear();
 	while (begin != end)
 	{
+		std::string token(*begin++);
+		LLStringUtil::trim(token);
+
 		if (match_whole_words)
 		{
-			mWordList.push_back(boost::regex_replace(std::string(*begin++), boost::regex("[.^$|()\\[\\]{}*+?\\\\]"), "\\\\&", boost::match_default|boost::format_sed));
+			mWordList.push_back(boost::regex_replace(token, boost::regex("[.^$|()\\[\\]{}*+?\\\\]"), "\\\\&", boost::match_default|boost::format_sed));
 		}
 		else
 		{
-			mWordList.push_back(*begin++);
+			mWordList.push_back(token);
 		}
 	}
 }