From f43f51406b024ed2423e068114ae818bac5c6df5 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 16 Jan 2013 14:53:23 -0800
Subject: [PATCH] CHUI-683 : Default sort order for Blocked was wrong,
unrecognized value was not tested.
---
indra/newview/app_settings/settings.xml | 2 +-
indra/newview/llpanelblockedlist.cpp | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 126df695197..fd4d1df894a 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10215,7 +10215,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>2</integer>
+ <integer>0</integer>
</map>
<key>CallLogSortOrder</key>
<map>
diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp
index df1ccdd9fca..115114bb53b 100644
--- a/indra/newview/llpanelblockedlist.cpp
+++ b/indra/newview/llpanelblockedlist.cpp
@@ -89,6 +89,9 @@ BOOL LLPanelBlockedList::postBuild()
case E_SORT_BY_TYPE:
mBlockedList->sortByType();
break;
+ default:
+ llwarns << "Unrecognized sort order for blocked list" << llendl;
+ break;
}
// Use the context menu of the Block list for the Block tab gear menu.
--
GitLab