From 3cb5c6864e0e19de30f3bba0f9fafd1ac695bfd1 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 17 Jan 2008 23:29:26 +0000 Subject: QAR-211: Logical merge of: svn merge -r 76578:76594 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxbhear-based-on-release-r76573 svn merge -r 77016:77668 svn+ssh://svn.lindenlab.com/svn/linden/branches/scrolllist_fixes svn merge -r 75889:75948 svn+ssh://svn.lindenlab.com/svn/linden/branches/simcrash-economy-fix svn merge -r 77312:77356 svn+ssh://svn.lindenlab.com/svn/linden/branches/revoke-gods plus addition to MANIFEST for revoke-gods Actual merge: svn merge -r 77525:77696 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-01-15-a * QAR-177 Linux Voice Support Merge BuildMe * QAR-197 merge of scrolllist_fixes into release for 1.19.0 (plus QAR-216 additions) * QAR-194 simcrash-economy-fix * QAR-201 Revoke gods added to deploy --- indra/newview/llpanelgroupnotices.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelgroupnotices.cpp') diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index c7c7912bf2..9ac88a3cc2 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -473,7 +473,7 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg) if (1 == count && id.isNull()) { // Only one entry, the dummy entry. - mNoticesList->addSimpleItem(mNoNoticesStr,ADD_BOTTOM,FALSE); + mNoticesList->addCommentText(mNoNoticesStr); mNoticesList->setEnabled(FALSE); return; } -- cgit v1.3