svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

1 files changed, 10 insertions, 1 deletions

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ed13f6dbe9..55256a6f23 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3884,7 +3884,16 @@ void process_alert_core(const char* buffer, BOOL modal)
 	}
 
 	// Translate system messages here.
-	if (buffer[0] == '/')
+	const char ALERT_PREFIX[] = "ALERT: ";
+	const size_t ALERT_PREFIX_LEN = sizeof(ALERT_PREFIX) - 1;
+	if (!strncmp(buffer, ALERT_PREFIX, ALERT_PREFIX_LEN))
+	{
+		// Allow the server to spawn a named alert so that server alerts can be
+		// translated out of English. JC
+		std::string alert_name(buffer + ALERT_PREFIX_LEN);
+		LLAlertDialog::showXml(alert_name);
+	}
+	else if (buffer[0] == '/')
 	{
 		// System message is important, show in upper-right box not tip
 		LLString text(buffer+1);