diff --git a/doc/contributions.txt b/doc/contributions.txt
index fa2737a47911bc8e5d0716c624141ff372817ea6..6edb727682ad4880042ab760fe9bcd0136ee41c3 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -120,6 +120,8 @@ Angus Boyd
 	VWR-592
 Ann Congrejo
 	CT-193
+Ardy Lay
+	VWR-19499
 Argent Stonecutter
 	VWR-68
 Armin Weatherwax
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 967db212447f87493714e757056ccc7dbef083cc..7d82ec3a71e612efaa1e0e6a1975863a9a95f33f 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -673,11 +673,30 @@ public:
 	bool handle(const LLSD& tokens, const LLSD& query_map,
 				LLMediaCtrl* web)
 	{
-		if (tokens.size() < 2) return false;
-		S32 channel = tokens[0].asInteger();
-		std::string mesg = tokens[1].asString();
-		send_chat_from_viewer(mesg, CHAT_TYPE_NORMAL, channel);
-		return true;
+		bool retval = false;
+		// Need at least 2 tokens to have a valid message.
+		if (tokens.size() < 2) 
+		{
+			retval = false;
+		}
+		else
+		{
+			S32 channel = tokens[0].asInteger();
+			// VWR-19499 Restrict function to chat channels greater than 0.
+			if ((channel > 0) && (channel < 2147483647))
+			{
+				retval = true;
+				// Say mesg on channel
+				std::string mesg = tokens[1].asString();
+				send_chat_from_viewer(mesg, CHAT_TYPE_NORMAL, channel);
+			}
+			else
+			{
+				retval = false;
+				// Tell us this is an unsupported SLurl.
+			}
+		}
+		return retval;
 	}
 };
 
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 4f9845d704297aeef8599bb2ffdbb91fe31d77a3..43630c13fd7f9cf5fd2597166a95f0a8e64c26b7 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -865,14 +865,30 @@ public:
 	bool handle(const LLSD& tokens, const LLSD& query_map,
 				LLMediaCtrl* web)
 	{
-		if (tokens.size() < 2) return false;
-		S32 channel = tokens[0].asInteger();
-
-		// Send unescaped message, see EXT-6353.
-		std::string unescaped_mesg (LLURI::unescape(tokens[1].asString()));
-
-		send_chat_from_viewer(unescaped_mesg, CHAT_TYPE_NORMAL, channel);
-		return true;
+		bool retval = false;
+		// Need at least 2 tokens to have a valid message.
+		if (tokens.size() < 2)
+		{
+			retval = false;
+		}
+		else
+		{
+			S32 channel = tokens[0].asInteger();
+			// VWR-19499 Restrict function to chat channels greater than 0.
+			if ((channel > 0) && (channel < 2147483647))
+			{
+				retval = true;
+				// Send unescaped message, see EXT-6353.
+				std::string unescaped_mesg (LLURI::unescape(tokens[1].asString()));
+				send_chat_from_viewer(unescaped_mesg, CHAT_TYPE_NORMAL, channel);
+			}
+			else
+			{
+				retval = false;
+				// Tell us this is an unsupported SLurl.
+			}
+		}
+		return retval;
 	}
 };