From e09479b140d7019dd9d5df786538dfaafb05c250 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 15 Jul 2018 22:17:08 +0200
Subject: [PATCH] Fix MAINT-8458 causing group notices being lost while
 composing

---
 indra/newview/llpanelgroupnotices.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index a9c403e927..3f8f299446 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -590,7 +590,13 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
 
 	mNoticesList->setNeedsSort(save_sort);
 	mNoticesList->updateSort();
-	mNoticesList->selectFirstItem();
+	// <FS:Ansariel> Don't do this while composing a new notice or you will lose it
+	//mNoticesList->selectFirstItem();
+	if (mPanelViewNotice->getVisible())
+	{
+		mNoticesList->selectFirstItem();
+	}
+	// </FS:Ansariel>
 }
 
 void LLPanelGroupNotices::onSelectNotice(LLUICtrl* ctrl, void* data)