From 2f756e3d268fb80f269541f2626c08f06d30ee2a Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 10 Jan 2017 10:23:09 +0100
Subject: [PATCH] FIRE-17834: Unscrew MAINT-2579 fix and apply the change only
 for those toasts it's necessary for

---
 indra/newview/lltoast.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index ad7b861a9d..74de8ffd54 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -405,6 +405,18 @@ void LLToast::setVisible(BOOL show)
 		{
 			mTimer->start();
 		}
+
+		// <FS:Ansariel> FIRE-17834: Local chat toasts sit above chat floater
+		if ((!mNotification.get() ||
+			(mNotification->getName() != "ScriptQuestion" &&
+			 mNotification->getName() != "ScriptQuestionCaution" &&
+			 mNotification->getName() != "ScriptQuestionExperience" &&
+			 mNotification->getName() != "UnknownScriptQuestion")) &&
+			 !getVisible())
+		{
+			LLModalDialog::setFrontmost(FALSE);
+		}
+		// </FS:Ansariel>
 	}
 	else
 	{